ашч commit

.gitea/workflows/deploy.yml

@@ -10,21 +10,6 @@ jobs:
         with:
           token: 0406afe7de6547e850dd62c84976c6def23a5193
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: false
-          load: true
-          tags: ebook:latest
-
-      - name: Save Docker image
-        run: |
-          docker save ebook:latest | gzip > ebook.tar.gz
-
       - name: Deploy via API
         env:
           GITEA_API: "https://gitea.miduway.space/api/v1/repos/levis/ebook/raw/main"
@@ -35,7 +20,7 @@ jobs:
           apt-get update && apt-get install -y curl
 
           # Загружаем конфигурационные файлы
-          for file in docker-compose.yml nginx.conf ebook.conf; do
+          for file in docker-compose.yml Dockerfile; do
             echo "Uploading $file"
             curl -X PUT \
               -H "Authorization: token $GITEA_TOKEN" \
@@ -43,13 +28,6 @@ jobs:
               "$GITEA_API/$file"
           done
 
-          # Загружаем Docker образ
-          echo "Uploading Docker image..."
-          curl -X PUT \
-            -H "Authorization: token $GITEA_TOKEN" \
-            -T "ebook.tar.gz" \
-            "$GITEA_API/ebook.tar.gz"
-
           # Выполняем деплой на сервер с игнорированием SSL
           echo "Deploying to server..."
           curl -k -X POST \

deploy-api.sh

@@ -15,29 +15,17 @@ curl -k -H "Authorization: token $GITEA_TOKEN" \
      "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/docker-compose.yml"
 
 curl -k -H "Authorization: token $GITEA_TOKEN" \
-     -o nginx.conf \
+     -o Dockerfile \
-     "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/nginx.conf"
+     "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/Dockerfile"
-
-curl -k -H "Authorization: token $GITEA_TOKEN" \
-     -o ebook.conf \
-     "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/ebook.conf"
-
-curl -k -H "Authorization: token $GITEA_TOKEN" \
-     -o ebook.tar.gz \
-     "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/ebook.tar.gz"
-
-# Загружаем Docker образ
-echo "Loading Docker image..."
-gunzip -c ebook.tar.gz | docker load
 
 # Копируем файлы в директорию деплоя
-cp -f docker-compose.yml nginx.conf ebook.conf $DEPLOY_DIR/
+cp -f docker-compose.yml Dockerfile $DEPLOY_DIR/
 
 # Переходим в директорию деплоя
 cd $DEPLOY_DIR
 
-# Перезапускаем контейнеры
+# Собираем и запускаем контейнеры
-docker-compose pull
+docker-compose build
 docker-compose up -d
 docker system prune -f