Merge branch 'L2SS-475-docker-sensitive-data' into 'master'

Resolve L2SS-475 "Docker sensitive data"

Closes L2SS-475

See merge request !187

docker-compose/.env

@@ -13,3 +13,8 @@ TANGO_JAVA_VERSION=9.3.6
 TANGO_POGO_VERSION=9.6.34
 TANGO_REST_VERSION=1.14.6
 TANGO_STARTER_VERSION=2021-05-28
+
+PG_SUPERUSER_PASSWORD=password
+PG_HDB_PASSWORD=hdbpp
+MYSQL_ROOT_PASSWORD=secret
+MYSQL_PASSWORD=tango

docker-compose/archiver-timescale.yml

@@ -13,7 +13,8 @@ services:
     depends_on:
       - databaseds
     environment:
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=${PG_SUPERUSER_PASSWORD}
+      - PG_HDB_PASSWORD=${PG_HDB_PASSWORD}
       - TANGO_HOST=${TANGO_HOST}
     logging:
       driver: syslog

docker-compose/archiver.yml

@@ -11,11 +11,11 @@ services:
     depends_on:
       - databaseds
     environment:
-      - MYSQL_ROOT_PASSWORD=secret
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=hdbpp
       - MYSQL_HOST=archiver-maria-db:3306
       - MYSQL_USER=tango
-      - MYSQL_PASSWORD=tango
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - TANGO_HOST=${TANGO_HOST}
     logging:
       driver: syslog

docker-compose/timescaledb/Dockerfile

 FROM timescale/timescaledb:latest-pg12
 
 
-COPY resources/01_admin.sql docker-entrypoint-initdb.d/002_admin.sql
+COPY resources/01_admin.sh docker-entrypoint-initdb.d/002_admin.sh
 COPY resources/02_hdb_schema.sql docker-entrypoint-initdb.d/003_hdb_schema.sql
 COPY resources/03_hdb_roles.sql docker-entrypoint-initdb.d/004_hdb_roles.sql
 COPY resources/04_hdb_ext_aggregates.sql docker-entrypoint-initdb.d/005_hdb_ext_aggregates.sql

docker-compose/timescaledb/resources/01_admin.sql → docker-compose/timescaledb/resources/01_admin.sh

-CREATE ROLE hdb_admin WITH LOGIN PASSWORD 'hdbpp';
+#!/bin/bash
+
+psql << EOF
+CREATE ROLE hdb_admin WITH LOGIN PASSWORD '${PG_HDB_PASSWORD}';
 ALTER USER hdb_admin CREATEDB;
 ALTER USER hdb_admin CREATEROLE;
 ALTER USER hdb_admin SUPERUSER;
+EOF