From c8a3dc0b0e599c84be3b7de2e7c984624f9f910f Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Mon, 15 Jan 2018 21:51:15 +0100
Subject: [PATCH] Use fixed Docker hostnames

---
 ckan-datapusher/etc/init.d/ckan-datapusher | 2 +-
 ckan.sh                                    | 6 +++---
 ckan/etc/init.d/ckan                       | 2 +-
 crisiscleanup.sh                           | 6 +++---
 crisiscleanup/etc/init.d/crisiscleanup     | 2 +-
 cts.sh                                     | 6 +++---
 cts/etc/init.d/cts                         | 2 +-
 gnuhealth.sh                               | 2 +-
 gnuhealth/etc/init.d/gnuhealth             | 2 +-
 kanboard.sh                                | 4 ++--
 kanboard/etc/init.d/kanboard               | 2 +-
 openmapkit/etc/init.d/openmapkit           | 2 +-
 postfix.sh                                 | 2 +-
 postfix/etc/init.d/postfix                 | 2 +-
 postgres.sh                                | 2 +-
 postgres/etc/init.d/postgres               | 2 +-
 rabbitmq/etc/init.d/rabbitmq               | 2 +-
 redis/etc/init.d/redis                     | 2 +-
 seeddms.sh                                 | 6 +++---
 seeddms/etc/init.d/seeddms                 | 2 +-
 solr/etc/init.d/solr                       | 2 +-
 21 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ckan-datapusher/etc/init.d/ckan-datapusher b/ckan-datapusher/etc/init.d/ckan-datapusher
index 281dbfd..784f1a8 100755
--- a/ckan-datapusher/etc/init.d/ckan-datapusher
+++ b/ckan-datapusher/etc/init.d/ckan-datapusher
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name ckan-datapusher -p 127.0.0.1:9004:8004 -v /srv/ckan-datapusher/conf:/etc/ckan-datapusher -v /srv/ckan-datapusher/data:/srv/ckan-datapusher/data ckan-datapusher
+	/usr/bin/docker run -d --rm --name ckan-datapusher -h ckan-datapusher -p 127.0.0.1:9004:8004 -v /srv/ckan-datapusher/conf:/etc/ckan-datapusher -v /srv/ckan-datapusher/data:/srv/ckan-datapusher/data ckan-datapusher
 }
 
 stop() {
diff --git a/ckan.sh b/ckan.sh
index f5d78bc..ad27aa2 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -28,9 +28,9 @@ cp ${SOURCE_DIR}/srv/ckan/update-ip.sh /srv/ckan/update-ip.sh
 /srv/ckan/update-ip.sh
 
 # Populate database
-docker run --rm --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan db init -c /etc/ckan/ckan.ini
-docker run --rm --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckanext-spatial spatial initdb -c /etc/ckan/ckan.ini
-docker run --rm --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan datastore set-permissions -c /etc/ckan/ckan.ini | docker exec -i postgres psql
+docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan db init -c /etc/ckan/ckan.ini
+docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckanext-spatial spatial initdb -c /etc/ckan/ckan.ini
+docker run --rm -h ckan --link=postgres --link=redis --link=solr -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan paster --plugin=ckan datastore set-permissions -c /etc/ckan/ckan.ini | docker exec -i postgres psql
 
 # Create admin account
 export CKAN_ADMIN_USER="admin"
diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan
index a98c293..50f8a90 100755
--- a/ckan/etc/init.d/ckan
+++ b/ckan/etc/init.d/ckan
@@ -13,7 +13,7 @@ start_pre() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name ckan --link=postgres --link=redis --link=solr --link=ckan-datapusher -p 127.0.0.1:9003:8003 -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan
+	/usr/bin/docker run -d --rm --name ckan -h ckan --link=postgres --link=redis --link=solr --link=ckan-datapusher -p 127.0.0.1:9003:8003 -v /srv/ckan/conf:/etc/ckan -v /srv/ckan/data:/srv/ckan/storage ckan
 }
 
 stop() {
diff --git a/crisiscleanup.sh b/crisiscleanup.sh
index 4083ec3..efba2f0 100755
--- a/crisiscleanup.sh
+++ b/crisiscleanup.sh
@@ -12,7 +12,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql
 # Copy existing config files into persistent storage
 mkdir -p /srv/crisiscleanup/conf
 chown 8005:8005 /srv/crisiscleanup/conf
-docker run --rm -v /srv/crisiscleanup/conf:/mnt/conf crisiscleanup cp -rp /srv/crisiscleanup/config/. /mnt/conf
+docker run --rm -h crisiscleanup -v /srv/crisiscleanup/conf:/mnt/conf crisiscleanup cp -rp /srv/crisiscleanup/config/. /mnt/conf
 chown root:root /srv/crisiscleanup/conf
 
 # Configure CrisisCleanup
@@ -26,8 +26,8 @@ cp ${SOURCE_DIR}/srv/crisiscleanup/conf/environments/production.rb /srv/crisiscl
 
 # Populate database
 envsubst <${SOURCE_DIR}/srv/crisiscleanup/db/seeds.rb >/tmp/seeds.rb
-docker run --rm --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup rake db:schema:load
-docker run --rm --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config -v /tmp/seeds.rb:/srv/crisiscleanup/db/seeds.rb crisiscleanup rake db:seed
+docker run --rm -h crisiscleanup --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup rake db:schema:load
+docker run --rm -h crisiscleanup --link=postgres -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config -v /tmp/seeds.rb:/srv/crisiscleanup/db/seeds.rb crisiscleanup rake db:seed
 rm /tmp/seeds.rb
 
 # Create CrisisCleanup service
diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup
index df78d02..c2f018f 100755
--- a/crisiscleanup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/etc/init.d/crisiscleanup
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name crisiscleanup --link=postgres -p 127.0.0.1:9005:8005 -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup
+	/usr/bin/docker run -d --rm --name crisiscleanup -h crisiscleanup --link=postgres -p 127.0.0.1:9005:8005 -v /srv/crisiscleanup/conf:/srv/crisiscleanup/config crisiscleanup
 }
 
 stop() {
diff --git a/cts.sh b/cts.sh
index 381756b..9a6c8af 100755
--- a/cts.sh
+++ b/cts.sh
@@ -12,7 +12,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql
 # Copy existing config files into persistent storage
 mkdir -p /srv/cts/conf
 chown 8006:8006 /srv/cts/conf
-docker run --rm -v /srv/cts/conf:/mnt/conf cts cp -rp /srv/cts/cts/settings/. /mnt/conf
+docker run --rm -h cts -v /srv/cts/conf:/mnt/conf cts cp -rp /srv/cts/cts/settings/. /mnt/conf
 chown -R root:root /srv/cts/conf
 
 # Configure CTS
@@ -25,12 +25,12 @@ if [ ${DEBUG:-0} -eq 0 ]; then
 fi
 
 # Populate database
-docker run --rm --link=postgres -v /srv/cts/conf:/srv/cts/cts/settings cts manage.py migrate
+docker run --rm -h cts --link=postgres -v /srv/cts/conf:/srv/cts/cts/settings cts manage.py migrate
 
 # Create admin account
 export CTS_ADMIN_EMAIL=admin@example.com
 export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
-export CTS_ADMIN_HASH=$(docker run --rm -v /srv/cts/conf:/srv/cts/cts/settings cts python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')")
+export CTS_ADMIN_HASH=$(docker run --rm -h cts -v /srv/cts/conf:/srv/cts/cts/settings cts python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')")
 export CTS_ADMIN_SECRET=$(head -c 12 /dev/urandom | sha256sum | cut -c1-13)
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql cts
 
diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts
index 249d081..969c530 100755
--- a/cts/etc/init.d/cts
+++ b/cts/etc/init.d/cts
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name cts --link=postgres -p 127.0.0.1:9006:8006 -v /srv/cts/conf:/srv/cts/cts/settings cts
+	/usr/bin/docker run -d --rm --name cts -h cts --link=postgres -p 127.0.0.1:9006:8006 -v /srv/cts/conf:/srv/cts/cts/settings cts
 }
 
 stop() {
diff --git a/gnuhealth.sh b/gnuhealth.sh
index ace9c99..25967b7 100755
--- a/gnuhealth.sh
+++ b/gnuhealth.sh
@@ -16,7 +16,7 @@ envsubst <${SOURCE_DIR}/srv/gnuhealth/conf/trytond.conf >/srv/gnuhealth/conf/try
 # Populate database
 export GNUHEALTH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
 echo ${GNUHEALTH_ADMIN_PWD} >/tmp/.adminpwd
-docker run --rm --link=postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.8/bin/trytond-admin -d gnuhealth --all -v
+docker run --rm -h gnuhealth --link=postgres -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config -v /tmp/.adminpwd:/tmp/.adminpwd -e TRYTONPASSFILE=/tmp/.adminpwd gnuhealth /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.8/bin/trytond-admin -d gnuhealth --all -v
 rm -f /tmp/.adminpwd
 
 # Populate demo database
diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth
index 9415005..45edb9c 100755
--- a/gnuhealth/etc/init.d/gnuhealth
+++ b/gnuhealth/etc/init.d/gnuhealth
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name gnuhealth --link=postgres -p 127.0.0.1:9008:8008 -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config gnuhealth
+	/usr/bin/docker run -d --rm --name gnuhealth -h gnuhealth --link=postgres -p 127.0.0.1:9008:8008 -v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config gnuhealth
 }
 
 stop() {
diff --git a/kanboard.sh b/kanboard.sh
index 94fbd62..705bc7b 100755
--- a/kanboard.sh
+++ b/kanboard.sh
@@ -8,14 +8,14 @@ docker build -t kanboard ${SOURCE_DIR}
 # Populate database
 export KANBOARD_PWD=$(head -c 18 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql
-docker run --rm kanboard cat /srv/kanboard/app/Schema/Sql/postgres.sql | docker exec -i -e PGPASSWORD=${KANBOARD_PWD} postgres psql kanboard kanboard
+docker run --rm -h kanboard kanboard cat /srv/kanboard/app/Schema/Sql/postgres.sql | docker exec -i -e PGPASSWORD=${KANBOARD_PWD} postgres psql kanboard kanboard
 
 # Configure Kanboard
 mkdir -p /srv/kanboard/conf /srv/kanboard/data
 envsubst <${SOURCE_DIR}/srv/kanboard/conf/config.php >/srv/kanboard/conf/config.php
 export KANBOARD_ADMIN_USER=admin
 export KANBOARD_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
-export KANBOARD_ADMIN_HASH=$(docker run --rm kanboard php -r "echo password_hash('${KANBOARD_ADMIN_PWD}', PASSWORD_BCRYPT);")
+export KANBOARD_ADMIN_HASH=$(docker run --rm -h kanboard kanboard php -r "echo password_hash('${KANBOARD_ADMIN_PWD}', PASSWORD_BCRYPT);")
 envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql kanboard
 chown 8009:8009 /srv/kanboard/data
 
diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard
index 3427d60..d1b8739 100755
--- a/kanboard/etc/init.d/kanboard
+++ b/kanboard/etc/init.d/kanboard
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name kanboard --link=postgres -p 127.0.0.1:9009:8009 -v /srv/kanboard/data:/srv/kanboard/app/data -v /srv/kanboard/conf/config.php:/srv/kanboard/config.php kanboard
+	/usr/bin/docker run -d --rm --name kanboard -h kanboard --link=postgres -p 127.0.0.1:9009:8009 -v /srv/kanboard/data:/srv/kanboard/app/data -v /srv/kanboard/conf/config.php:/srv/kanboard/config.php kanboard
 }
 
 stop() {
diff --git a/openmapkit/etc/init.d/openmapkit b/openmapkit/etc/init.d/openmapkit
index 69783c7..bd96c17 100755
--- a/openmapkit/etc/init.d/openmapkit
+++ b/openmapkit/etc/init.d/openmapkit
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name openmapkit -p 127.0.0.1:9007:8007 -v /srv/openmapkit/settings.js:/srv/openmapkit/settings.js -v /srv/openmapkit/data:/srv/openmapkit/data openmapkit
+	/usr/bin/docker run -d --rm --name openmapkit -h openmapkit  -p 127.0.0.1:9007:8007 -v /srv/openmapkit/settings.js:/srv/openmapkit/settings.js -v /srv/openmapkit/data:/srv/openmapkit/data openmapkit
 }
 
 stop() {
diff --git a/postfix.sh b/postfix.sh
index 73cc002..5f54b94 100755
--- a/postfix.sh
+++ b/postfix.sh
@@ -7,7 +7,7 @@ docker build -t postfix ${SOURCE_DIR}
 # Copy existing config files into persistent storage
 mkdir -p /srv/postfix/conf /srv/postfix/data
 chown -R 587:587 /srv/postfix/data
-docker run --rm -v /srv/postfix/conf:/mnt/conf postfix cp -rp /etc/postfix/. /mnt/conf
+docker run --rm -h postfix -v /srv/postfix/conf:/mnt/conf postfix cp -rp /etc/postfix/. /mnt/conf
 
 # Configure postfix
 cp ${SOURCE_DIR}/srv/postfix/conf/main.cf /srv/postfix/conf/main.cf
diff --git a/postfix/etc/init.d/postfix b/postfix/etc/init.d/postfix
index ea7932d..ab7f800 100755
--- a/postfix/etc/init.d/postfix
+++ b/postfix/etc/init.d/postfix
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name postfix -v /srv/postfix/conf:/etc/postfix -v /srv/postfix/data:/var/spool/postfix postfix
+	/usr/bin/docker run -d --rm --name postfix -h postfix -v /srv/postfix/conf:/etc/postfix -v /srv/postfix/data:/var/spool/postfix postfix
 }
 
 stop() {
diff --git a/postgres.sh b/postgres.sh
index a90e444..31a95a9 100755
--- a/postgres.sh
+++ b/postgres.sh
@@ -9,7 +9,7 @@ docker build -t postgres ${SOURCE_DIR}
 mkdir /srv/postgres
 chown -R 5432:5432 /srv/postgres
 chmod 700 /srv/postgres
-docker run --rm --name postgres -v /srv/postgres:/var/lib/postgresql postgres initdb -D /var/lib/postgresql
+docker run --rm --name postgres -h postgres -v /srv/postgres:/var/lib/postgresql postgres initdb -D /var/lib/postgresql
 
 # Configure Postgres
 cp ${SOURCE_DIR}/srv/postgres/postgresql.conf /srv/postgres/postgresql.conf
diff --git a/postgres/etc/init.d/postgres b/postgres/etc/init.d/postgres
index 7f9ab00..a19a497 100755
--- a/postgres/etc/init.d/postgres
+++ b/postgres/etc/init.d/postgres
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name postgres -v /srv/postgres:/var/lib/postgresql postgres
+	/usr/bin/docker run -d --rm --name postgres -h postgres -v /srv/postgres:/var/lib/postgresql postgres
 }
 
 stop() {
diff --git a/rabbitmq/etc/init.d/rabbitmq b/rabbitmq/etc/init.d/rabbitmq
index 14994c1..16a13e2 100755
--- a/rabbitmq/etc/init.d/rabbitmq
+++ b/rabbitmq/etc/init.d/rabbitmq
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name rabbitmq -v /srv/rabbitmq/data:/var/lib/rabbitmq/mnesia rabbitmq
+	/usr/bin/docker run -d --rm --name rabbitmq -h rabbitmq -v /srv/rabbitmq/data:/var/lib/rabbitmq/mnesia rabbitmq
 }
 
 stop() {
diff --git a/redis/etc/init.d/redis b/redis/etc/init.d/redis
index 8c9b818..0e83179 100755
--- a/redis/etc/init.d/redis
+++ b/redis/etc/init.d/redis
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name redis -v /srv/redis/redis.conf:/etc/redis.conf -v /srv/redis/data:/var/lib/redis redis
+	/usr/bin/docker run -d --rm --name redis -h redis -v /srv/redis/redis.conf:/etc/redis.conf -v /srv/redis/data:/var/lib/redis redis
 }
 
 stop() {
diff --git a/seeddms.sh b/seeddms.sh
index d07a402..6e6a5e3 100755
--- a/seeddms.sh
+++ b/seeddms.sh
@@ -8,12 +8,12 @@ docker build -t seeddms ${SOURCE_DIR}
 # Populate database
 export SEEDDMS_PWD=$(head -c 18 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql
-docker run --rm seeddms cat /srv/seeddms/create_tables-postgres.sql | docker exec -i -e PGPASSWORD=${SEEDDMS_PWD} postgres psql seeddms seeddms
+docker run --rm -h seeddms seeddms cat /srv/seeddms/create_tables-postgres.sql | docker exec -i -e PGPASSWORD=${SEEDDMS_PWD} postgres psql seeddms seeddms
 
 # Copy existing files into persistent storage
 mkdir -p /srv/seeddms/conf /srv/seeddms/data
-docker run --rm -v /srv/seeddms/conf:/mnt/conf seeddms cp -rp /srv/seeddms/www/conf/. /mnt/conf
-docker run --rm -v /srv/seeddms/data:/mnt/conf seeddms cp -rp /srv/seeddms/data/. /mnt/conf
+docker run --rm -h seeddms -v /srv/seeddms/conf:/mnt/conf seeddms cp -rp /srv/seeddms/www/conf/. /mnt/conf
+docker run --rm -h seeddms -v /srv/seeddms/data:/mnt/conf seeddms cp -rp /srv/seeddms/data/. /mnt/conf
 chown -R 8010:8010 /srv/seeddms/data
 
 # Configure SeedDMS
diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms
index f5f4272..ec840d4 100755
--- a/seeddms/etc/init.d/seeddms
+++ b/seeddms/etc/init.d/seeddms
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name seeddms --link=postgres -p 127.0.0.1:9010:8010 -v /srv/seeddms/data:/srv/seeddms/data -v /srv/seeddms/conf:/srv/seeddms/www/conf seeddms
+	/usr/bin/docker run -d --rm --name seeddms -h seeddms --link=postgres -p 127.0.0.1:9010:8010 -v /srv/seeddms/data:/srv/seeddms/data -v /srv/seeddms/conf:/srv/seeddms/www/conf seeddms
 }
 
 stop() {
diff --git a/solr/etc/init.d/solr b/solr/etc/init.d/solr
index 639c7bb..ed732a7 100755
--- a/solr/etc/init.d/solr
+++ b/solr/etc/init.d/solr
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	/usr/bin/docker run -d --rm --name solr -v /srv/solr/data:/var/lib/solr solr
+	/usr/bin/docker run -d --rm --name solr -h solr -v /srv/solr/data:/var/lib/solr solr
 }
 
 stop() {