From 1a4b2cf3b70849d7816bf6a36f3f2f338fdca869 Mon Sep 17 00:00:00 2001
From: Dmitriy <chupa5598@gmail.com>
Date: Sat, 17 Aug 2024 12:08:39 +0300
Subject: [PATCH 1/2] =?UTF-8?q?Compose=20=D0=B8=20Workflow=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D1=8F=20dev=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/main.yml | 81 ++++++++++++++++++++++++++++++++++++++
 docker-compose.yaml        | 35 ++++++++++------
 2 files changed, 104 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..43e0716
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,81 @@
+name: Main Workflow
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+#   test:
+#     runs-on: ubuntu-24.04
+
+#     services:
+#       postgres:
+#         image: postgres:16
+#         env:
+#           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+#           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+#           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+#         ports:
+#           - 5432:5432
+#         options: >-
+#           --health-cmd "pg_isready -U ${{ secrets.POSTGRES_USER }}" 
+#           --health-interval 10s 
+#           --health-timeout 5s 
+#           --health-retries 5
+
+#       adminer:
+#         image: adminer:4.8.1
+#         ports:
+#           - 8080:8080
+
+#     steps:
+#     - name: Checkout code
+#       uses: actions/checkout@v3
+
+#     - name: Set up Python
+#       uses: actions/setup-python@v4
+#       with:
+#         python-version: '3.12'
+
+#     - name: Install dependencies
+#       run: |
+#         python -m pip install --upgrade pip
+#         pip install -r requirements.txt
+
+#     - name: Run tests
+#       env:
+#         DATABASE_URL: postgres://postgres:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}
+#       run: |
+#         pytest
+
+  deploy:
+    runs-on: ubuntu-24.04
+    # needs: test
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Deploy to server
+      uses: appleboy/ssh-action@v0.1.5
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USER }}
+        key: ${{ secrets.SSH_KEY }}
+        passphrase: ${{ secrets.SSH_PASSPHRASE }}
+        script: |
+          cd /Privet_Logoped_team_4/
+          git pull origin dev
+          source /Privet_Logoped_team_4/src/telegram_bot/venv/bin/activate
+          pip install -r src/telegram_bot/requirements.txt
+          alembic upgrade head
+          deactivate
+          source /Privet_Logoped_team_4/src/vk_bot/venv/bin/activate
+          pip install -r src/vk_bot/requirements.txt
+          deactivate
+          sudo systemctl restart docker-compose-db.service
+          sudo systemctl restart telegram-bot.service
+          sudo systemctl restart vk-bot.service
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6b43e6f..d4250ef 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,22 +1,33 @@
 version: '3'
 
 services:
-
-  db:
-    image: postgres
-    restart: always
-    shm_size: 128mb
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    env_file: .env
+  postgres:
+    image: postgres:16
+    container_name: postgres_db
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
     ports:
-      - "5433:5432"
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - db_network
 
   adminer:
-    image: adminer
-    restart: always
+    image: adminer:4.8.1
+    container_name: adminer
     ports:
       - "8080:8080"
+    networks:
+      - db_network
+    depends_on:
+      - postgres
 
 volumes:
-  db-data:
+  postgres_data:
+
+networks:
+  db_network:
+    driver: bridge

From c099d699d32ee6b9e31a793ea0cea3ad2ee7e375 Mon Sep 17 00:00:00 2001
From: Dmitriy <chupa5598@gmail.com>
Date: Sat, 17 Aug 2024 12:15:16 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20Workflow=20(=D1=83=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20=D1=87=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=20pr)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/main.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43e0716..6941a56 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - dev
-  pull_request:
-    branches:
-      - dev
 
 jobs:
 #   test: