aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2017-07-28 09:24:17 +0200
committerasteroide <thomas.duval@orange.com>2017-07-28 09:24:17 +0200
commit845dca2727c28fbff0b86ef7275d8b182354a85f (patch)
tree34062b90caa0e2d4b16048388d05b21d0cb8cdb8
parent40846f11077378fbe4b37fba58c844ebbc31a282 (diff)
Add bootstrap file to configure and run orchestrator
Change-Id: I1ffca2ccfd90dfa3fc22e49d39d8905765a50b7a
-rw-r--r--moonv4/moon_orchestrator/Changelog4
-rw-r--r--moonv4/moon_orchestrator/Dockerfile7
-rw-r--r--moonv4/moon_orchestrator/moon_orchestrator/__init__.py2
3 files changed, 10 insertions, 3 deletions
diff --git a/moonv4/moon_orchestrator/Changelog b/moonv4/moon_orchestrator/Changelog
index 544e8fd1..31aabf5d 100644
--- a/moonv4/moon_orchestrator/Changelog
+++ b/moonv4/moon_orchestrator/Changelog
@@ -19,3 +19,7 @@ CHANGES
-----
- add Changelog
+1.1.0
+-----
+- add bootstrap file to start Orchestrator with all configuration
+
diff --git a/moonv4/moon_orchestrator/Dockerfile b/moonv4/moon_orchestrator/Dockerfile
index 0425d959..b68c130f 100644
--- a/moonv4/moon_orchestrator/Dockerfile
+++ b/moonv4/moon_orchestrator/Dockerfile
@@ -1,6 +1,9 @@
FROM ubuntu:latest
-RUN apt update && apt install python3.5 python3-pip -y
+ENV CONSUL_HOST=consul
+ENV CONSUL_PORT=8500
+
+RUN apt update && apt install python3.5 python3-pip python3-mysql.connector -y
RUN pip3 install pip --upgrade
ADD . /root
@@ -8,4 +11,4 @@ WORKDIR /root/
RUN pip3 install -r requirements.txt --upgrade
RUN pip3 install . --upgrade
-CMD ["python3", "-m", "moon_orchestrator"] \ No newline at end of file
+CMD ["python3", "bootstrap.py"] \ No newline at end of file
diff --git a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
index 2249a1b6..2302dea9 100644
--- a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
+++ b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
@@ -3,4 +3,4 @@
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "1.0.1"
+__version__ = "1.1.0"