aboutsummaryrefslogtreecommitdiffstats
path: root/moon_forming
diff options
context:
space:
mode:
Diffstat (limited to 'moon_forming')
-rw-r--r--moon_forming/Dockerfile1
-rw-r--r--moon_forming/run.sh18
2 files changed, 12 insertions, 7 deletions
diff --git a/moon_forming/Dockerfile b/moon_forming/Dockerfile
index bc6b699e..ca0eba76 100644
--- a/moon_forming/Dockerfile
+++ b/moon_forming/Dockerfile
@@ -1,4 +1,5 @@
FROM python:3
+
WORKDIR /usr/src/app
RUN pip install --no-cache-dir --upgrade requests pyyaml python_moonutilities python_moondb python_moonclient
diff --git a/moon_forming/run.sh b/moon_forming/run.sh
index a4d89204..d731cb17 100644
--- a/moon_forming/run.sh
+++ b/moon_forming/run.sh
@@ -5,8 +5,9 @@ populate_args=$*
echo "Waiting for Consul (http://consul:8500)"
while ! python -c "import requests; req = requests.get('http://consul:8500')" 2>/dev/null ; do
sleep 5 ;
- echo "."
+ echo -n "."
done
+echo "."
echo "Consul (http://consul:8500) is up."
python3 /root/conf2consul.py /etc/moon/moon.conf
@@ -14,8 +15,9 @@ python3 /root/conf2consul.py /etc/moon/moon.conf
echo "Waiting for DB (tcp://db:3306)"
while ! python -c "import socket, sys; s = socket.socket(socket.AF_INET, socket.SOCK_STREAM); s.connect(('db', 3306)); sys.exit(0)" 2>/dev/null ; do
sleep 5 ;
- echo "."
+ echo -n "."
done
+echo "."
echo "Database (http://db:3306) is up."
moon_db_manager upgrade
@@ -23,17 +25,19 @@ moon_db_manager upgrade
echo "Waiting for Keystone (http://keystone:5000)"
while ! python -c "import requests; req = requests.get('http://keystone:5000')" 2>/dev/null ; do
sleep 5 ;
- echo "."
+ echo -n "."
done
+echo "."
echo "Keystone (http://keystone:5000) is up."
echo "Waiting for Manager (http://manager:8082)"
while ! python -c "import requests; req = requests.get('http://manager:8082')" 2>/dev/null ; do
sleep 5 ;
- echo "."
+ echo -n "."
done
+echo "."
echo "Manager (http://manager:8082) is up."
-for i in /data/*.py ; do
- moon_populate_values $populate_args --consul-host=consul --consul-port=8500 $i
-done
+#for i in /data/*.py ; do
+# moon_populate_values $populate_args --consul-host=consul --consul-port=8500 $i
+#done