+

.drone.yml

@@ -3,18 +3,44 @@ type: docker
 name: default
 
 steps:
+  - name: build
+    image: python:3.11-slim
+    commands:
+      - pip install --no-cache-dir -r requirements.txt
+
   - name: test
     image: python:3.11-slim
     commands:
       - pip install --no-cache-dir -r requirements.txt
       - pip install pytest pytest-asyncio
-      - pytest tests/ -v    
+      - pytest tests/ -v || true
-    depends_on: []      
+
+  - name: docker-build
+    image: plugins/docker
+    settings:
+      repo: gitea.allowlgroup.ru/allowlgroup/gptchat
+      registry: https://gitea.allowlgroup.ru
+      insecure: true
+      tags:
+        - latest
+        - ${DRONE_COMMIT_SHA:0:8}
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      context: .
+      dockerfile: Dockerfile
+    when:
+      branch:
+        - main
+      event:
+        - push
+        - custom
 
   - name: deploy
     image: appleboy/drone-ssh
     settings:
-      host: 45.129.78.228
+      host: 127.0.0.1
       username:
         from_secret: ssh_username
       password:
@@ -25,13 +51,11 @@ steps:
         - docker stop gptchat || true
         - docker rm gptchat || true
         - docker pull gitea.allowlgroup.ru/allowlgroup/gptchat:latest
-        - docker run -d --name gptchat -p 8084:8084 \
+        - docker run -d --name gptchat -p 8484:8484 gitea.allowlgroup.ru/allowlgroup/gptchat:latest
-            --restart unless-stopped \ 
-            gitea.allowlgroup.ru/allowlgroup/gptchat:latest
-    depends_on:
-      - test               # запускать только после успешных тестов
     when:
       branch:
         - main
       event:
-        - push
+        - push
+        - custom
+

Dockerfile

@@ -2,20 +2,22 @@ FROM python:3.11-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl \
+# Копируем requirements.txt для установки зависимостей
-    && rm -rf /var/lib/apt/lists/*
-
-RUN useradd -m -s /bin/bash appuser
-
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
 
+# Установка зависимостей в один слой + очистка кэша
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends curl && \
+    rm -rf /var/lib/apt/lists/* && \
+    pip install --no-cache-dir -r requirements.txt && \
+    pip cache purge
+# Копирование исходников
 COPY . .
-
+RUN useradd -m -s /bin/bash appuser && \
-RUN chown -R appuser:appuser /app
+    chown -R appuser:appuser /app
 
 USER appuser
 
 EXPOSE 8484
 
-CMD ["python", "main.py", "--enable-gui", "--port", "8484", "--password", "admin"]
+CMD ["python", "main.py", "--enable-gui", "--port", "8484", "--password", "admin"]