Merge branch 'CI-CD-pipline' of https://github.com/tactful-ai/microce…

…ntral into CI-CD-pipline
tactful-ai · Sep 25, 2024 · 2194609 · 2194609
2 parents fafb6dd + 9d7b7bc
commit 2194609
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -33,16 +33,16 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN}}
 
-      # - name: Extract the latest Git tag
-      #   run: |
-      #     echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-      #     echo $TAG
+      - name: Extract the latest Git tag
+        run: |
+          echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+          echo $TAG
 
       - name: Build and Push Backend Image
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: tactful/microcentral-backend:latest
+          tags: tactful/microcentral-backend:${{ env.TAG }}
           context: . 
           file: ./Dockerfile 
 
@@ -70,15 +70,15 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN}}
 
-      # - name: Extract the latest Git tag
-      #   run: echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Extract the latest Git tag
+        run: echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
 
       - name: Build and Push frontend Image
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: tactful/microcentral-frontend:latest
-            #${{env.TAG}}
+          tags: tactful/microcentral-frontend:${{ env.TAG }}
+
           context: ./frontend
           file: ./frontend/Dockerfile
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     backend:
         profiles:   # will start only if `docker-compose --profile prod up` is used
             - prod
-        image: tactful/microcentral-backend:latest
+        image: tactful/microcentral-backend:v1.5.8
         command: poetry run uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
         volumes:
             - .:/usr/src/app
@@ -67,7 +67,7 @@ services:
             - ADMINER_DEFAULT_SERVER=database
 
     frontend:
-        image: tactful/microcentral-frontend:latest
+        image: tactful/microcentral-frontend:v1.5.8
         depends_on:
             - backend
             - database
@@ -82,4 +82,4 @@ networks:
         driver: bridge
 
 volumes:
-    postgres_data:
+    postgres_data: