From 0e6340367842b4d999cf9aa9fbf82a65d9d3809f Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 14:53:30 +0200 Subject: [PATCH 01/11] Test run --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 832555d..7b78443 100644 --- a/app.js +++ b/app.js @@ -1,3 +1,3 @@ -console.log("Test"); +console.log("Test 1"); From 23d04c2f2d331a7b0438aceef3b30b513060b9bd Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 14:55:07 +0200 Subject: [PATCH 02/11] Remove unwanted code --- .github/workflows/deploy.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8d52441..7032f8c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -25,13 +25,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - # Read the env file and expose the environment variables inside the gh action job - - name: Environment - Load the env variables from the env file - run: cat ${{ env.ENV_FILE }} >> $GITHUB_ENV - - - name: Download all the required jar files - run: make jars-get - - name: AWS - Configure credentials uses: aws-actions/configure-aws-credentials@v4 with: From 6a0159f2eb6babfa2b151128f74ac28fc87526d5 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:08:59 +0200 Subject: [PATCH 03/11] Remove unwanted code --- .github/workflows/deploy.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 7032f8c..6e273d2 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -25,13 +25,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - - name: AWS - Configure credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} - aws-region: ${{ secrets.AWS_ECR_REGION }} - - name: ECR - Login id: ecr-login uses: aws-actions/amazon-ecr-login@v2 From 5965c812cc2c7dde3c4831b91cfb953e2e446c6c Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:21:21 +0200 Subject: [PATCH 04/11] Added docker hub --- .github/workflows/deploy.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 6e273d2..cf7970e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -25,15 +25,15 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - - name: ECR - Login - id: ecr-login - uses: aws-actions/amazon-ecr-login@v2 - with: - mask-password: 'true' - - name: Docker - Buildx setup uses: docker/setup-buildx-action@v3 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Docker - Build and Push uses: docker/build-push-action@v6 with: @@ -41,4 +41,4 @@ jobs: file: Dockerfile platforms: linux/amd64,linux/arm64 context: . - tags: "${{ steps.ecr-login.outputs.registry }}/${{ github.event.repository.name }}:${{ env.VERSION }},${{ steps.ecr-login.outputs.registry }}/${{ github.event.repository.name }}:latest, ${{ steps.ecr-login.outputs.registry }}/${{ github.event.repository.name }}:${{ github.sha }}" + tags: "${{ steps.ecr-login.outputs.registry }}/caching_issues:latest, ${{ steps.ecr-login.outputs.registry }}/caching_issues:${{ github.sha }}" From 31ef44b49fe40d4bed61f29f4eff97e54ec10ae8 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:28:37 +0200 Subject: [PATCH 05/11] Added secrets --- .github/workflows/deploy.yaml | 11 ++--------- .github/workflows/pull_request.yaml | 6 ++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index cf7970e..174db55 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -3,22 +3,15 @@ name: Common Job on: workflow_call: secrets: - PUBLISH_PACKAGES: + DOCKER_USERNAME: required: true - AWS_ECR_ACCESS_KEY_ID: - required: true - AWS_ECR_SECRET_ACCESS_KEY: - required: true - AWS_ECR_REGION: + DOCKER_PASSWORD: required: true jobs: build: runs-on: ubuntu-latest timeout-minutes: 10 - env: - ENV_FILE: .env - GITHUB_ACCESS_TOKEN: ${{ secrets.PUBLISH_PACKAGES }} name: Build and deploy the docker image to ECR steps: diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index d658fcd..70e48c1 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -12,7 +12,5 @@ jobs: build: uses: ./.github/workflows/deploy.yaml secrets: - PUBLISH_PACKAGES: ${{ secrets.PUBLISH_PACKAGES }} - AWS_ECR_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }} - AWS_ECR_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }} - AWS_ECR_REGION: ${{ secrets.AWS_ECR_REGION }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} From faf1b33050111a81480a810c79fa4d6aa06d87bb Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:32:37 +0200 Subject: [PATCH 06/11] Added secrets --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 174db55..416a4a2 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -34,4 +34,4 @@ jobs: file: Dockerfile platforms: linux/amd64,linux/arm64 context: . - tags: "${{ steps.ecr-login.outputs.registry }}/caching_issues:latest, ${{ steps.ecr-login.outputs.registry }}/caching_issues:${{ github.sha }}" + tags: "${{ secrets.DOCKER_USERNAME }}/caching_issues:latest, ${{ secrets.DOCKER_USERNAME }}/caching_issues:${{ github.sha }}" From 057d8a490269c946581be0daa099939a9bf727dd Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:35:54 +0200 Subject: [PATCH 07/11] Added caching --- .github/workflows/deploy.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 416a4a2..49a5c75 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -27,6 +27,14 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-test + restore-keys: | + ${{ runner.os }}-buildx- + - name: Docker - Build and Push uses: docker/build-push-action@v6 with: @@ -35,3 +43,5 @@ jobs: platforms: linux/amd64,linux/arm64 context: . tags: "${{ secrets.DOCKER_USERNAME }}/caching_issues:latest, ${{ secrets.DOCKER_USERNAME }}/caching_issues:${{ github.sha }}" + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache,new=true From 9ba5a7ac5de42ba05e7a7f215d2fa156a4e03df1 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Mon, 29 Jul 2024 15:39:52 +0200 Subject: [PATCH 08/11] Empty-Commit From 01c0b7fbc8953bfb7533792ca5b00991221d8541 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Tue, 30 Jul 2024 11:41:36 +0200 Subject: [PATCH 09/11] Added a dependency --- package-lock.json | 34 ++++++++++++++++++++++++++++++++++ package.json | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..d01c6e9 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,34 @@ +{ + "name": "caching_issue", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "caching_issue", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "dotenv": "^16.4.5" + } + }, + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + } + }, + "dependencies": { + "dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==" + } + } +} diff --git a/package.json b/package.json index f821fff..ca01bbd 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,8 @@ "bugs": { "url": "https://github.com/CandisIO/caching_issue/issues" }, - "homepage": "https://github.com/CandisIO/caching_issue#readme" + "homepage": "https://github.com/CandisIO/caching_issue#readme", + "dependencies": { + "dotenv": "^16.4.5" + } } From 351475895bcc10d26546ab1d78da7b9bcdb5f074 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Tue, 30 Jul 2024 11:44:31 +0200 Subject: [PATCH 10/11] Empty-Commit From a889f8ed1336c7e9c915d19250131b99f91250d6 Mon Sep 17 00:00:00 2001 From: Anko1418 Date: Tue, 30 Jul 2024 11:47:02 +0200 Subject: [PATCH 11/11] Empty-Commit