Merge branch 'main' of https://super-admins.online/TSB/WebServer

.gitea/workflows/deploy.yaml

@@ -23,9 +23,9 @@ jobs:
       - name: Deploy to Server
         run: |
           ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }} "
-            cd ${{ secrets.PROJECT_PATH }} &&
+            cd ${{ secrets.PROJECT_PATH }} && \
-            git pull origin main &&
+            git pull origin main && \
-            docker-compose down --remove-orphans &&
+            docker-compose down --remove-orphans && \
-            sleep 3 &&
+            sleep 3 && \
             docker-compose up -d --build
           "

docker-compose.yaml

@@ -13,36 +13,3 @@ services:
       - /etc/letsencrypt/live/super-admins.online/privkey.pem:/etc/nginx/conf.d/privkey.pem
       - /etc/letsencrypt/live/super-admins.online/fullchain.pem:/etc/nginx/conf.d/fullchain.pem
 
-  server:
-    image: docker.gitea.com/gitea:1.23.7
-    container_name: gitea
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - GITEAdatabaseDB_TYPE=postgres
-      - GITEAdatabaseHOST=db:5432
-      - GITEAdatabaseNAME=gitea
-      - GITEAdatabaseUSER=gitea
-      - GITEAdatabasePASSWD=gitea
-    restart: always
-
-    volumes:
-      - /home/apotheosis/gitea:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "3000:3000"
-      - "222:22"
-    depends_on:
-      - db
-
-  db:
-    image: docker.io/library/postgres:14
-    restart: always
-    environment:
-      - POSTGRES_USER=gitea
-      - POSTGRES_PASSWORD=gitea
-      - POSTGRES_DB=gitea
-
-    volumes:
-      - /home/apotheosis/postgres:/var/lib/postgresql/data