From 0437d6546d368dad3638d59c73c7f56a04b12c8a Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 1 Jun 2020 22:45:37 +0200
Subject: [PATCH] [docker_test.sh] Manage special condition where folder is
present before pulling but not secret files
---
docker_test.sh | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/docker_test.sh b/docker_test.sh
index 988d8d1c..b1fb1646 100755
--- a/docker_test.sh
+++ b/docker_test.sh
@@ -14,6 +14,18 @@ usage() {
exit 1
}
+create_dumb_secrets() {
+ if [[ -d secrets ]]; then
+ cd secrets
+ echo -e "\n==== Create dumb secret files ===="
+ for f in *.secrets.example; do
+ echo -e "\tFile $1/secrets/$(basename -- "$f" .secrets.example).secrets created"
+ cp -- "$f" "$(basename -- "$f" .secrets.example).secrets"
+ done
+ cd ..
+ fi
+}
+
if [[ $(hostname) != *"test"* ]]; then
echo "ERROR : DO NOT USE OUTSIDE OF A TEST MACHINE !"
usage
@@ -33,6 +45,7 @@ if [[ -d "$1" ]]; then
cd "$1"
echo -e "\n==== Stop and remove existing containers ===="
+ create_dumb_secrets()
docker-compose down
cd ..
else
@@ -59,15 +72,7 @@ fi
cd "$1"
-if [[ -d secrets ]]; then
- cd secrets
- echo -e "\n==== Create dumb secret files ===="
- for f in *.secrets.example; do
- echo -e "\tFile $1/secrets/$(basename -- "$f" .secrets.example).secrets created"
- cp -- "$f" "$(basename -- "$f" .secrets.example).secrets"
- done
- cd ..
-fi
+create_dumb_secrets()
echo -e "\n==== Replace production URL with testing URL in all files ===="
for f in $(grep -l -r ".picasoft.net" .); do
--
GitLab