Skip to content

Commit 034fb65

Browse files
refactor: streamline Docker image build and push steps using build-push-action
1 parent 9b8944d commit 034fb65

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

.github/workflows/docker-build-and-push.yml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,22 @@ jobs:
6868
# Create historical tag using TAG, DATE_TAG, and RUN_ID
6969
echo "HISTORICAL_TAG=${{ env.TAG }}_${DATE_TAG}_${RUN_ID}" >> $GITHUB_ENV
7070
71-
- name: Build and push Docker images optionally
72-
run: |
73-
# Backend Image Build and Push
74-
cd src/backend
75-
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }} -f Dockerfile . && \
76-
docker tag ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }} ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.HISTORICAL_TAG }} && \
77-
78-
if [[ "${{ env.TAG }}" == "latest" || "${{ env.TAG }}" == "dev" || "${{ env.TAG }}" == "demo" || "${{ env.TAG }}" == "hotfix" || "${{ env.TAG }}" == "psl-conregchanges" ]]; then
79-
docker push ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }} && \
80-
docker push ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.HISTORICAL_TAG }} && \
81-
echo "Backend image built and pushed successfully."
82-
else
83-
echo "Skipping Docker push for backend with tag: ${{ env.TAG }}"
84-
fi
85-
86-
# Frontend Image Build and Push
87-
cd ../frontend
88-
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }} -f Dockerfile . && \
89-
docker tag ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }} ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.HISTORICAL_TAG }} && \
71+
- name: Build and optionally push Backend Docker image
72+
uses: docker/build-push-action@v6
73+
with:
74+
context: ./src/backend
75+
file: ./src/backend/Dockerfile
76+
push: ${{ env.TAG != 'pullrequest-ignore' }}
77+
tags: |
78+
${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }}
79+
${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.HISTORICAL_TAG }}
9080
91-
if [[ "${{ env.TAG }}" == "latest" || "${{ env.TAG }}" == "dev" || "${{ env.TAG }}" == "demo" || "${{ env.TAG }}" == "hotfix" || "${{ env.TAG }}" == "psl-conregchanges" ]]; then
92-
docker push ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }} && \
93-
docker push ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.HISTORICAL_TAG }} && \
94-
echo "Frontend image built and pushed successfully."
95-
else
96-
echo "Skipping Docker push for frontend with tag: ${{ env.TAG }}"
97-
fi
81+
- name: Build and optionally push Frontend Docker image
82+
uses: docker/build-push-action@v6
83+
with:
84+
context: ./src/frontend
85+
file: ./src/frontend/Dockerfile
86+
push: ${{ env.TAG != 'pullrequest-ignore' }}
87+
tags: |
88+
${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }}
89+
${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.HISTORICAL_TAG }}

0 commit comments

Comments
 (0)