New structure docker files, update makefile. New main.yml

.dockerignore

@@ -29,9 +29,9 @@ pip-wheel-metadata/
 .eggs/
 
 # Exclude Docker Compose files (if not needed inside the container)
-docker-compose.yml
-docker-compose.dev.yml
-docker-compose.prod.yml
+docker/docker-compose.yml
+docker/docker-compose.dev.yml
+docker/docker-compose.prod.yml
 
 # Exclude various images and pictures if they are not required for assembly
 img/

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: ${{ secrets.DOCKER_USERNAME }}/hamster_bot:v1.8.3
+          tags: ${{ secrets.DOCKER_USERNAME }}/hamster_bot:v1.8.5
 
   deploy:
     runs-on: ubuntu-latest
@@ -50,7 +50,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           port: ${{ secrets.PORT }}
           key: ${{ secrets.SSHKEY }}
-          source: "redis.conf,docker-compose.prod.yml"
+          source: "redis.conf,Makefile,docker/docker-compose.yml,docker/docker-compose.prod.yml"
           target: "/home/${{ secrets.USERNAME }}/Hamster-generator"
 
       - name: Execute deployment commands
@@ -62,8 +62,11 @@ jobs:
           key: ${{ secrets.SSHKEY }}
           script: |
             cd /home/ubuntu/Hamster-generator
-            ls -la
-
+            
+            sed -i 's/IMAGE_TAG=.*/IMAGE_TAG=v1.8.5/' .env.prod
+            
+            make prod-down
+            make prod-up
 
   create-release:
     runs-on: ubuntu-latest
@@ -76,10 +79,10 @@ jobs:
       - name: Create GitHub Release
         uses: ncipollo/release-action@v1
         with:
-          tag: v1.8.3
-          name: "Release v1.8.3"
+          tag: v1.8.5
+          name: "Release v1.8.5"
           body: |
-            Dockerhub deploy. New workflow. Message to telegram. Final release | 🏖️
+            Final release | 🏖️
           token: ${{ secrets.GITHUB_TOKEN }}
 
   send_message:

Makefile

@@ -11,7 +11,13 @@ run_bot:
 	python3 -m bot.main
 
 run_dev_db_docker:
-	docker-compose -f docker-compose.dev.yml up postgres redis
+	docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.dev.yml --env-file .env.prod up postgres redis
 
 run_dev_bot_docker:
-	docker-compose -f docker-compose.dev.yml up bot
+	docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.dev.yml --env-file .env.prod up bot
+
+prod-up:
+	docker-compose -f docker-compose.yml -f docker-compose.prod.yml --env-file .env.prod up -d
+
+prod-down:
+	docker-compose -f docker-compose.yml -f docker-compose.prod.yml --env-file .env.prod down

Dockerfile → docker/Dockerfile

@@ -2,16 +2,16 @@ FROM python:3.12.2-slim
 
 RUN apt-get update && apt-get install -y postgresql-client && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /assistant
+WORKDIR /hamster
 
-COPY requirements.txt requirements.txt
+COPY ../requirements.txt requirements.txt
 
 RUN pip install --upgrade pip \
  && pip install -r requirements.txt
 
-COPY app app
-COPY bot bot
-COPY alembic alembic
-COPY alembic.ini alembic.ini
-COPY db db
-COPY config config
+COPY ../app app
+COPY ../bot bot
+COPY ../alembic alembic
+COPY ../alembic.ini alembic.ini
+COPY ../db db
+COPY ../config config

docker/Dockerfile.dev

@@ -0,0 +1,12 @@
+FROM python:3.12.2-slim
+
+RUN apt-get update && apt-get install -y postgresql-client && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /hamster
+
+COPY ../requirements-dev.txt requirements-dev.txt
+
+RUN pip install --upgrade pip \
+ && pip install -r requirements-dev.txt
+
+COPY .. .

docker/docker-compose.dev.yml

@@ -0,0 +1,31 @@
+services:
+  app:
+    build:
+      context: ../
+      dockerfile: ./docker/Dockerfile.dev
+    env_file:
+      - ../.env.dev
+    volumes:
+      - .:/hamster
+    command: python3 -m app.main
+    depends_on:
+      - postgres
+      - redis
+    networks:
+      - app-network
+
+  bot:
+    build:
+      context: ../
+      dockerfile: ./docker/Dockerfile.dev
+    env_file:
+      - ../.env.dev
+    volumes:
+      - ../:/hamster
+      - ../images_data:/hamster/bot/images
+    command: python3 -m bot.main
+    depends_on:
+      - postgres
+      - redis
+    networks:
+      - app-network

docker/docker-compose.prod.yml

@@ -0,0 +1,40 @@
+services:
+  migrate:
+    image: lymarvolodymyr/hamster_bot:${IMAGE_TAG}
+    env_file:
+      - ../.env.prod
+    command: alembic upgrade head
+    depends_on:
+      - postgres
+    networks:
+      - app-network
+
+  app:
+    image: lymarvolodymyr/hamster_bot:${IMAGE_TAG}
+    env_file:
+      - ../.env.prod
+    command: python3 -m app.main
+    volumes:
+      - ./proxies.txt:/hamster/proxies.txt
+      - ./logs/app:/hamster/logs/app
+    depends_on:
+      - migrate
+      - postgres
+      - redis
+    networks:
+      - app-network
+
+  bot:
+    image: lymarvolodymyr/hamster_bot:${IMAGE_TAG}
+    env_file:
+      - ../.env.prod
+    command: python3 -m bot.main
+    volumes:
+      - ./images_data:/hamster/bot/images
+      - ./logs/bot:/hamster/logs/bot
+    depends_on:
+      - migrate
+      - postgres
+      - redis
+    networks:
+      - app-network