fix: update build and deploy steps in workflow and refine docker-compose configuration

.gitea/workflows/build.yml

@@ -21,30 +21,30 @@ jobs:
           docker build -t ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app -f app/Dockerfile .
           docker push ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app
 
-  # deploy:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-  #     - name: Instasll SSH key
-  #       uses: webfactory/ssh-agent@v0.9.0
-  #       with:
-  #         ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
+      - name: Instasll SSH key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
 
-  #     - name: Add host to known_hosts
-  #       run: ssh-keyscan -H ${{ secrets.LXC_HOST }} >> ~/.ssh/known_hosts
+      - name: Add host to known_hosts
+        run: ssh-keyscan -H ${{ secrets.LXC_HOST }} >> ~/.ssh/known_hosts
       
-  #     - name: Deploy docker-compose-ci.yml
-  #       run: scp docker-compose-ci.yml ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }}:/srv/app/docker-compose.yml
+      - name: Deploy docker-compose-ci.yml
+        run: scp docker-compose-ci.yml ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }}:/srv/app/docker-compose.yml
       
-  #     - name: Restart services
-  #       run: |
-  #         ssh ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }} << 'EOF'
-  #           echo "${{ secrets.TOKEN }}" | docker login ${{ secrets.GIT_HOST }} -u ${{ secrets.USERNAME }} --password-stdin
-  #           docker pull ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app
-  #           cd /srv/app
-  #           docker compose up -d --force-recreate
-  #           docker image prune -f
-  #         EOF
+      - name: Restart services
+        run: |
+          ssh ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }} << 'EOF'
+            echo "${{ secrets.TOKEN }}" | docker login ${{ secrets.GIT_HOST }} -u ${{ secrets.USERNAME }} --password-stdin
+            docker pull ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app
+            cd /srv/app
+            docker compose up -d --force-recreate
+            docker image prune -f
+          EOF

docker-compose-ci.yml

@@ -1,8 +1,8 @@
+version: '3.9'
+
 services:
   app:
-    build:
-      context: .
-      dockerfile: app/Dockerfile
+    image: https://${{ GIT_HOST }}/${{ GIT_USER }}/${{ GIT_REPO }}:app
     command: uvicorn app.main:app --host 0.0.0.0 --port 8000
     env_file:
       - .env
@@ -10,7 +10,7 @@ services:
       PROJECT_NAME: ${PROJECT_NAME}
       VERSION: ${VERSION}
       API_V1_PREFIX: ${API_V1_PREFIX}
-      DB_HOST: ${DB_HOST:-postgres}
+      DB_HOST: postgres
       DB_PORT: ${DB_PORT}
       DB_NAME: ${DB_NAME}
       DB_USER: ${DB_USER}
@@ -21,7 +21,7 @@ services:
       ACCESS_TOKEN_EXPIRE_MINUTES: ${ACCESS_TOKEN_EXPIRE_MINUTES}
       REFRESH_TOKEN_EXPIRE_DAYS: ${REFRESH_TOKEN_EXPIRE_DAYS}
       REDIS_ENABLED: ${REDIS_ENABLED}
-      REDIS_URL: ${REDIS_URL:-redis://redis:6379/0}
+      REDIS_URL: redis://redis:6379/0
       ANALYTICS_CACHE_TTL_SECONDS: ${ANALYTICS_CACHE_TTL_SECONDS}
       ANALYTICS_CACHE_BACKOFF_MS: ${ANALYTICS_CACHE_BACKOFF_MS}
     ports:
@@ -36,8 +36,6 @@ services:
       POSTGRES_DB: ${DB_NAME}
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
     ports:
       - "5432:5432"
 
@@ -46,6 +44,3 @@ services:
     command: redis-server --save "" --appendonly no
     ports:
       - "6379:6379"
-
-volumes:
-  postgres_data: