Merge pull request #3 from teoincontatto/GermanDZ-dockerization

Fixes for secret

.docker/run.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
 /toro_dist/setup.sh
+/toro_dist/bin/torodb -c torodb.yml -l
 /toro_dist/bin/torodb -c torodb.yml

.docker/setup.sh

@@ -2,7 +2,8 @@
 
 cp -r $(ls -d /toro/torodb-*-SNAPSHOT)/* /toro_dist
 
-echo postgres:5432:*:postgres:$TOROPASS > ~/.pgpass
+POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-}"
+echo "postgres:5432:*:postgres:$POSTGRES_PASSWORD" > ~/.pgpass
 chmod 400 ~/.pgpass
 echo -n "Waiting PostgreSQL..."
 while ! psql -h postgres -U postgres -c "SELECT 1" > /dev/null 2>&1
@@ -12,7 +13,12 @@ do
 done
 echo
 
-psql -h postgres -U postgres -c "CREATE USER torodb WITH SUPERUSER PASSWORD '$TOROPASS'"
+TORODB_PASSWORD="${TORODB_PASSWORD:-trustme}"
+echo "postgres:5432:torod:torodb:$TORODB_PASSWORD" > ~/.toropass
+chown 400 ~/.toropass
+psql -h postgres -U postgres -c "CREATE USER torodb PASSWORD '$TORODB_PASSWORD'"
 psql -h postgres -U postgres -c "CREATE DATABASE torod OWNER torodb"
 
 rm ~/.pgpass
+POSTGRES_PASSWORD=
+TORODB_PASSWORD=

Dockerfile

@@ -11,5 +11,4 @@ ADD .docker/run.sh /toro_dist
 ADD .docker/torodb.yml /toro_dist
 EXPOSE 27018
 
-ENV TOROPASS trustme
 CMD /toro_dist/run.sh

docker-compose.yml

@@ -5,7 +5,7 @@ services:
   postgres:
     image: postgres:9.5
     environment:
-      - POSTGRES_PASSWORD=trustme
+      - POSTGRES_PASSWORD
     ports:
       - "5432:5432"
   toro:
@@ -18,6 +18,9 @@ services:
       - postgres
     volumes:
       - toro_build:/toro
+    environment:
+      - POSTGRES_PASSWORD
+      - TORODB_PASSWORD
   toro_building:
     build:
       context: .