diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8d52441..49a5c75 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -3,50 +3,37 @@ 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: - 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: Docker - Buildx setup + uses: docker/setup-buildx-action@v3 - - name: AWS - Configure credentials - uses: aws-actions/configure-aws-credentials@v4 + - name: Login to DockerHub + uses: docker/login-action@v2 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 }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - - name: ECR - Login - id: ecr-login - uses: aws-actions/amazon-ecr-login@v2 + - name: Cache Docker layers + uses: actions/cache@v3 with: - mask-password: 'true' - - - name: Docker - Buildx setup - uses: docker/setup-buildx-action@v3 + 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 @@ -55,4 +42,6 @@ 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: "${{ 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 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 }} 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"); 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" + } }