From 5faf558daace79d2c9b0a3cb54d6bf31f57728b6 Mon Sep 17 00:00:00 2001
From: 4l3j0Ok <alejofsarmiento@gmail.com>
Date: Sun, 24 Dec 2023 14:41:18 -0300
Subject: [PATCH] Update deploy workflow

---
 .github/workflows/deploy.yaml                 | 10 +++----
 .gitignore                                    |  2 +-
 deploy/dev.compose.yml                        | 19 -------------
 deploy/docker-compose.yml                     | 27 -------------------
 stack/.env.sample                             | 15 +++++++++++
 .../docker-compose.yml                        |  3 +--
 6 files changed, 22 insertions(+), 54 deletions(-)
 delete mode 100644 deploy/dev.compose.yml
 delete mode 100755 deploy/docker-compose.yml
 create mode 100644 stack/.env.sample
 rename deploy/prod.compose.yml => stack/docker-compose.yml (93%)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index db8548d..85292af 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -8,6 +8,8 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "stack/**"
 
 jobs:
   deploy:
@@ -22,13 +24,11 @@ jobs:
       name: Setting up Stack
       run: |
         mkdir -p $PROJECT_PATH
-        cp -f ./deploy/prod.compose.yml $PROJECT_PATH/docker-compose.yml
-        echo "$BACKEND_ENV_CONTENT" > $PROJECT_PATH/.backend.env
-        echo "$MONGO_ENV_CONTENT" > $PROJECT_PATH/.mongo.env
+        cp -f ./stack/prod.compose.yml $PROJECT_PATH/docker-compose.yml
+        echo "$ENV_CONTENT" > $PROJECT_PATH/.backend.env
       env:
         PROJECT_PATH: ${{ secrets.PROJECT_PATH }}
-        BACKEND_ENV_CONTENT: ${{ secrets.BACKEND_ENV_CONTENT }}
-        MONGO_ENV_CONTENT: ${{ secrets.MONGO_ENV_CONTENT }}
+        ENV_CONTENT: ${{ secrets.ENV_CONTENT }}
     -
       name: Pull changes and restart
       run: |
diff --git a/.gitignore b/.gitignore
index 92d038f..a46658c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 __pycache__/
 *.pyc
 venv/
-deploy/data/
+stack/data/
 *.env
 todo.md
\ No newline at end of file
diff --git a/deploy/dev.compose.yml b/deploy/dev.compose.yml
deleted file mode 100644
index 3926d0d..0000000
--- a/deploy/dev.compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.9"
-services:
-
-  backend:
-    image: alejoide/bcra-scraper-api:latest
-    ports:
-      - 8080:8080
-    restart: no
-    volumes:
-      - ../backend/src:/app/src
-    env_file:
-      - .backend.env
-    networks:
-      - mongo
-
-
-networks:
-  mongo:
-    external: true
\ No newline at end of file
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
deleted file mode 100755
index 94c5fd0..0000000
--- a/deploy/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "3.9"
-services:
-
-  backend:
-    image: alejoide/bcra-scraper-api:latest
-    restart: unless-stopped
-    depends_on:
-      - mongo
-    env_file:
-      - .backend.env
-    networks:
-      - default
-      - nginx-proxy
-
-  mongo:
-    image: mongo:7.0.4
-    restart: unless-stopped
-    env_file:
-      - .mongo.env
-    volumes:
-      - ./data:/data/db
-
-
-# Only for production environments when using jwilder/nginx-proxy.
-networks:
-  nginx-proxy:
-    external: true
diff --git a/stack/.env.sample b/stack/.env.sample
new file mode 100644
index 0000000..1bcb7f8
--- /dev/null
+++ b/stack/.env.sample
@@ -0,0 +1,15 @@
+# BASE APP CONFIG
+APP_HOST="0.0.0.0"
+APP_PORT="8080"
+# MONGO CONNECTION
+MONGO_HOST="your-mongo-host"
+MONGO_PORT="27017"
+MONGO_USER="your-mongo-user"
+MONGO_PASS="your-mongo-pass"
+# UPDATE ENDPOINTS
+ADMIN_USER="your-admin-user"
+ADMIN_PASS="your-admin-pass"
+# NGINX PROXY
+VIRTUAL_HOST="bcra-scraper-api.your-domain.com"
+VIRTUAL_PORT="8080"
+LETSENCRYPT_HOST="bcra-scraper-api.your-domain.com"
\ No newline at end of file
diff --git a/deploy/prod.compose.yml b/stack/docker-compose.yml
similarity index 93%
rename from deploy/prod.compose.yml
rename to stack/docker-compose.yml
index c45c5ce..a18b44a 100644
--- a/deploy/prod.compose.yml
+++ b/stack/docker-compose.yml
@@ -5,12 +5,11 @@ services:
     image: alejoide/bcra-scraper-api:latest
     restart: unless-stopped
     env_file:
-      - .backend.env
+      - .env
     networks:
       - mongo
       - nginx-proxy
 
-
 # Only for production environments when using jwilder/nginx-proxy.
 networks:
   nginx-proxy: