From 05486f6e354516de2cd4cdbe16af3d36df42d3c0 Mon Sep 17 00:00:00 2001
From: nmaillat <maillat@alchemy.fr>
Date: Tue, 12 May 2020 00:09:46 +0200
Subject: [PATCH] Renaming INSTALL env name

---
 docker-compose.yml                | 18 +++++++++---------
 docker/phraseanet/auto-install.sh |  4 ++--
 docker/phraseanet/entrypoint.sh   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 74490e9d35..c3516c6b9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,18 +42,18 @@ services:
     - OPCACHE_ENABLED
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
-    - INSTALL_ACCOUNT_EMAIL
-    - INSTALL_ACCOUNT_PASSWORD
-    - INSTALL_DB_HOST
-    - INSTALL_DB_PORT
-    - INSTALL_DB_USER
-    - INSTALL_DB_PASSWORD
+    - PHRASEANET_ADMIN_ACCOUNT_EMAIL
+    - PHRASEANET_ADMIN_ACCOUNT_PASSWORD
+    - PHRASEANET_DB_HOST
+    - PHRASEANET_DB_PORT
+    - PHRASEANET_DB_USER
+    - PHRASEANET_DB_PASSWORD
     - INSTALL_DB_TEMPLATE
     - INSTALL_APPBOX
     - INSTALL_DATABOX
-    - INSTALL_SERVER_NAME
-    - INSTALL_RABBITMQ_USER=$RABBITMQ_DEFAULT_USER
-    - INSTALL_RABBITMQ_PASSWORD=$RABBITMQ_DEFAULT_PASS
+    - PHRASEANET_SERVER_NAME
+    - PHRASEANET_RABBITMQ_USER=$RABBITMQ_DEFAULT_USER
+    - PHRASEANET_RABBITMQ_PASSWORD=$RABBITMQ_DEFAULT_PASS
     - PHRASEANET_EMITTER_EMAIL
     - PHRASEANET_MAIL_OBJECT_PREFIX
     - PHRASEANET_SMTP_ENABLED
diff --git a/docker/phraseanet/auto-install.sh b/docker/phraseanet/auto-install.sh
index b8b54348a0..de8dee4a9a 100755
--- a/docker/phraseanet/auto-install.sh
+++ b/docker/phraseanet/auto-install.sh
@@ -33,8 +33,8 @@ fi
 bin/setup system:config set workers.queue.worker-queue.registry alchemy_worker.queue_registry 
 bin/setup system:config set workers.queue.worker-queue.host rabbitmq
 bin/setup system:config set workers.queue.worker-queue.port 5672 
-bin/setup system:config set workers.queue.worker-queue.user $INSTALL_RABBITMQ_USER
-bin/setup system:config set workers.queue.worker-queue.password $INSTALL_RABBITMQ_PASSWORD
+bin/setup system:config set workers.queue.worker-queue.user $PHRASEANET_RABBITMQ_USER
+bin/setup system:config set workers.queue.worker-queue.password $PHRASEANET_RABBITMQ_PASSWORD
 bin/setup system:config set workers.queue.worker-queue.vhost /
 
 /var/alchemy/Phraseanet/bin/console compile:configuration
diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh
index 536b6ec7ad..9d22cef4ff 100755
--- a/docker/phraseanet/entrypoint.sh
+++ b/docker/phraseanet/entrypoint.sh
@@ -31,7 +31,7 @@ if [ -f "$FILE" ]; then
         bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL
         bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX
     fi
-    bin/console user:password --user_id=1 --password=$PHRASEANET_ADMIN_ACCOUNT_PASSWORD
+    bin/console user:password --user_id=1 --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
 else
     echo "$FILE doesn't exist, entering setup..."
     runuser app -c docker/phraseanet/auto-install.sh