From 33be997855495ec52230ca41caef79c5a45ddbbd Mon Sep 17 00:00:00 2001
From: meysamhadeli <meysamhadeli@gmail.com>
Date: Wed, 25 Jan 2023 03:35:39 +0330
Subject: [PATCH] .

---
 .github/workflows/build-publish-docker.yml | 51 +++++++++++++++-------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml
index 4d35a9c..2eb3a42 100644
--- a/.github/workflows/build-publish-docker.yml
+++ b/.github/workflows/build-publish-docker.yml
@@ -3,6 +3,8 @@ name: build-publish-docker
 on:
   push:
     branches: [ develop ]
+    tags:
+      - 'v*'
   pull_request:
 
 jobs:
@@ -12,11 +14,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - id: version
-        uses: battila7/get-version-action@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/thedatabaseme/hello-world
+          flavor: latest=true
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -24,17 +33,27 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Build image
-        run: |
-          docker build -t meysamh66/booking-microservices-flight:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-identity:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-passenger:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-booking:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./src/Services/Flight/Dockerfile
+          push: ${{ github.ref_type == 'tag' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Publish image
-        run: |
-          docker push meysamh66/booking-microservices-flight:${{ steps.version.outputs.version }}
-          docker push meysamh66/booking-microservices-identity:${{ steps.version.outputs.version }}
-          docker push meysamh66/booking-microservices-passenger:${{ steps.version.outputs.version }}
-          docker push meysamh66/booking-microservices-booking:${{ steps.version.outputs.version }}
+
+#      - name: Build image
+#        run: |
+#          docker build -t meysamh66/booking-microservices-flight:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
+#          docker build -t meysamh66/booking-microservices-identity:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
+#          docker build -t meysamh66/booking-microservices-passenger:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
+#          docker build -t meysamh66/booking-microservices-booking:${{ steps.version.outputs.version }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
+#
+#      - name: Publish image
+#        run: |
+#          docker push meysamh66/booking-microservices-flight:${{ steps.version.outputs.version }}
+#          docker push meysamh66/booking-microservices-identity:${{ steps.version.outputs.version }}
+#          docker push meysamh66/booking-microservices-passenger:${{ steps.version.outputs.version }}
+#          docker push meysamh66/booking-microservices-booking:${{ steps.version.outputs.version }}