cleanup ngeo env vars, add relevant secrets to renderer/registrar

cache/entrypoint.sh

@@ -36,5 +36,4 @@ EOF
 }
 
 file_env "OS_PASSWORD"
-file_env "OS_PASSWORD_DOWNLOAD"
 eval "$@"

core/entrypoint.sh

@@ -38,8 +38,6 @@ EOF
 }
 
 file_env "OS_PASSWORD"
-file_env "OS_PASSWORD_DOWNLOAD"
-file_env "DB_PW"
 file_env "DJANGO_PASSWORD"
 
 eval "/opt/eoxserver/eoxserver-entrypoint.sh $@"

docker-compose.dem.yml

@@ -46,7 +46,6 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "database:5432"
@@ -154,15 +153,12 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      SCALEFACTOR: "1"
-      IN_MEMORY: "false"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
       OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
-      REPORTING_DIR: '/mnt/reports/'
+      REPORTING_DIR: "/mnt/reports/"
     configs:
       - source: init-db
         target: /init-db.sh

docker-compose.emg.yml

@@ -43,14 +43,15 @@ services:
       - env/emg_obs.env
     secrets:
       - DJANGO_PASSWORD
+      - OS_PASSWORD
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "database:5432"
       DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -71,14 +72,12 @@ services:
       - env/emg_obs.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_cache"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "database:5432 renderer:80"
       WAIT_TIMEOUT: 300  # wait up to 5 minutes
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 1
     networks:
@@ -96,13 +95,11 @@ services:
       - env/emg_redis.env
     secrets:
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_seeder"
       RENDERER_HOST: renderer
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     deploy:
       replicas: 0
     networks:
@@ -159,21 +156,17 @@ services:
       - env/emg_obs.env
       - env/emg_redis.env
     secrets:
+      - DJANGO_PASSWORD
       - OS_PASSWORD
-      - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      SCALEFACTOR: "1"
-      IN_MEMORY: "false"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
-      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
-      
-      REPORTING_DIR: '/mnt/reports/'
+      DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
+      REPORTING_DIR: "/mnt/reports/"
     configs:
       - source: init-db
         target: /init-db.sh

docker-compose.vhr18.yml

@@ -46,7 +46,6 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "database:5432"
@@ -167,15 +166,12 @@ services:
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
-      SCALEFACTOR: "1"
-      IN_MEMORY: "false"
-      COLLECT_STATIC: "false"
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
       OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
-      REPORTING_DIR: '/mnt/reports/'
+      REPORTING_DIR: "/mnt/reports/"
     configs:
       - source: init-db
         target: /init-db.sh

documentation/operator-guide/configuration.rst

@@ -100,9 +100,11 @@ Environment variables and ``.env`` files are passed to the services via the
       environment:
         INSTANCE_ID: "prism-view-server_registrar"
         INSTALL_DIR: "/var/www/pvs/dev/"
-        SCALEFACTOR: "1"
-        IN_MEMORY: "false"
-        INIT_SCRIPTS: "/configure.sh /init-db.sh"
+        INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
+        STARTUP_SCRIPTS: "/wait-initialized.sh"
+        WAIT_SERVICES: "redis:6379 database:5432"
+        OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
+        OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
       # ...
 
 ``.env`` Files

testing/gitlab_test.sh

@@ -27,9 +27,6 @@ set +o allexport
 mkdir data
 docker swarm init
 docker network create -d overlay emg-extnet
-echo "inside gitlab_test"
-echo $OS_PASSWORD
-echo $DJANGO_PASSWORD
 
 # creat the docker secrets
 printf $OS_PASSWORD_DOWNLOAD | docker secret create OS_PASSWORD_DOWNLOAD -
@@ -53,9 +50,9 @@ if [ $? -ne 0 ]
 then
   echo "Failure in tests, logging from services:"
   for service in $(docker service ls --format "{{.Name}}"); do
-    echo "Service:  ${service}"
-    docker service logs $service
+    echo "________________________________________"
     docker service ps $service --no-trunc
+    docker service logs $service
   done  
   exit 1
 fi

testing/registrar_test.sh

 #!/bin/bash
 product_list_file=$1
 echo "inside registrar_test"
-echo $OS_PASSWORD
-echo $DJANGO_PASSWORD
 
-docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py storage create pvs_testing pvs_testing --type swift --storage-auth auth-cloud-ovh
 IFS=","
 
 while read product; do