diff --git a/.github/workflows/build-push-ecr.yaml b/.github/workflows/build-push-ecr.yaml index 58d9d374..ba3d6c83 100644 --- a/.github/workflows/build-push-ecr.yaml +++ b/.github/workflows/build-push-ecr.yaml @@ -5,9 +5,9 @@ on: pull_request: branches: [ "main" ] -# env: -# Dockerfile_Backend: Dockerfile -# Dockerfile_Web: web/Dockerfile +env: + Dockerfile_Backend: Dockerfile + Dockerfile_Web: web/Dockerfile jobs: build: runs-on: ubuntu-latest @@ -19,7 +19,7 @@ jobs: uses: docker/setup-buildx-action@v3.0.0 - name: Setup AWS Creds - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4.0.2 with: aws-access-key-id: ${{ secrets.ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.SECRET_ACCESS_KEY }} @@ -30,38 +30,37 @@ jobs: id: ecr-login uses: aws-actions/amazon-ecr-login@v1 - # - name: Build Backend and and push - # if: github.event_name != 'pull_request' - # env: - # ECR_REGISTRY: ${{ steps.ecr-login.outputs.registry }} - # ECR_REPOSITORY: ${{ secrets.BACKEND_ECR_REPOSITORY }} - # run: | - # VERSION_TAG=$(echo "${{ github.ref }}" | cut -d'/' -f 3) - # TAG=$ECR_REGISTRY/$ECR_REPOSITORY:${VERSION_TAG} - # docker build --platform linux/amd64 --push -t ${TAG} -f ${{ env.Dockerfile_Backend }} . - # - # - name: Build Backend image - # if: github.event_name == 'pull_request' - # run: | - # docker build --platform linux/amd64 -f ${{ env.Dockerfile_Backend }} . - # - # - # - name: Build Web and and push - # if: github.event_name != 'pull_request' - # env: - # ECR_REGISTRY: ${{ steps.ecr-login.outputs.registry }} - # ECR_REPOSITORY: ${{ secrets.WEB_ECR_REPOSITORY }} - # run: | - # VERSION_TAG=$(echo "${{ github.ref }}" | cut -d'/' -f 3) - # TAG=$ECR_REGISTRY/$ECR_REPOSITORY:${VERSION_TAG} - # docker build --platform linux/amd64 --push -t ${TAG} -f ${{ env.Dockerfile_Web }} web/ - # - # - name: Build Web image - # if: github.event_name == 'pull_request' - # run: | - # docker build --platform linux/amd64 -f ${{ env.Dockerfile_Web }} web/ - # #docker - # + - name: Build Backend and and push + if: github.event_name != 'pull_request' + env: + ECR_REGISTRY: ${{ steps.ecr-login.outputs.registry }} + ECR_REPOSITORY: ${{ secrets.BACKEND_ECR_REPOSITORY }} + run: | + VERSION_TAG=$(echo "${{ github.ref }}" | cut -d'/' -f 3) + TAG=$ECR_REGISTRY/$ECR_REPOSITORY:${VERSION_TAG} + docker build --platform linux/amd64 --push -t ${TAG} -f ${{ env.Dockerfile_Backend }} . + + - name: Build Backend image + if: github.event_name == 'pull_request' + run: | + docker build --platform linux/amd64 -f ${{ env.Dockerfile_Backend }} . + + + - name: Build Web and and push + if: github.event_name != 'pull_request' + env: + ECR_REGISTRY: ${{ steps.ecr-login.outputs.registry }} + ECR_REPOSITORY: ${{ secrets.WEB_ECR_REPOSITORY }} + run: | + VERSION_TAG=$(echo "${{ github.ref }}" | cut -d'/' -f 3) + TAG=$ECR_REGISTRY/$ECR_REPOSITORY:${VERSION_TAG} + docker build --platform linux/amd64 --push -t ${TAG} -f ${{ env.Dockerfile_Web }} web/ + + - name: Build Web image + if: github.event_name == 'pull_request' + run: | + docker build --platform linux/amd64 -f ${{ env.Dockerfile_Web }} web/ +