From 3546e51d9ee713379cf84e3f00cee5d94300d957 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <riccardo.didato@gmail.com>
Date: Mon, 19 Sep 2022 23:00:10 +0200
Subject: [PATCH] CICD

---
 cicd/docker-compose/{production.yml => deploy.yml} | 2 +-
 scripts/generateComposeFolder.sh                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename cicd/docker-compose/{production.yml => deploy.yml} (97%)

diff --git a/cicd/docker-compose/production.yml b/cicd/docker-compose/deploy.yml
similarity index 97%
rename from cicd/docker-compose/production.yml
rename to cicd/docker-compose/deploy.yml
index af9391a..98361da 100644
--- a/cicd/docker-compose/production.yml
+++ b/cicd/docker-compose/deploy.yml
@@ -16,7 +16,7 @@ services:
     image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§-webserver
     env_file:
     - environments/common/webserver.env
-    - environments/production/webserver.env
+    - environments/§ENVIRONMENT_TYPE§/webserver.env
     depends_on:
     - mongo
     - memcached
diff --git a/scripts/generateComposeFolder.sh b/scripts/generateComposeFolder.sh
index 18920cf..1fc0835 100755
--- a/scripts/generateComposeFolder.sh
+++ b/scripts/generateComposeFolder.sh
@@ -48,12 +48,12 @@ while getopts "i:o:t:hvlLsp" o; do
             SELECTED_MODES+=1
             ;;
         s)
-            STARTING_FILE="$DIR/../cicd/docker-compose/test.yml"
+            STARTING_FILE="$DIR/../cicd/docker-compose/deploy.yml"
             ENV_TYPE="test"
             SELECTED_MODES+=1
             ;;
         p)
-            STARTING_FILE="$DIR/../cicd/docker-compose/production.yml"
+            STARTING_FILE="$DIR/../cicd/docker-compose/deploy.yml"
             ENV_TYPE="production"
             SELECTED_MODES+=1
             ;;