Merge v8.0 Into Master

[osm/devops.git] / docker / PLA / Dockerfile

diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile
index 8bc5137..5d675e9 100644 (file)
--- a/docker/PLA/Dockerfile
+++ b/docker/PLA/Dockerfile
@@ -20,10 +20,11 @@ LABEL authors="Lars-Göran Magnusson"
 RUN apt-get --yes update \
  && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
  && apt-get --yes install mysql-client curl software-properties-common libgl1-mesa-glx \
- && pip3 install pip==9.0.3
+ && python3 -m pip install -U pip \
+ && python3 -m pip install pymzn==0.18.3
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -37,6 +38,17 @@ RUN apt-get --yes update  && apt-get -y install python3-osm-common${COMMON_VERSI
 
 COPY scripts/ scripts/
 
+ADD https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.2/MiniZincIDE-2.4.2-bundle-linux-x86_64.tgz /minizinc.tgz
+
+RUN tar -zxf /minizinc.tgz && \
+    mv /MiniZincIDE-2.4.2-bundle-linux /minizinc
+
+RUN mkdir /entry_data \
+    && mkdir /entry_data/mzn-lib \
+    && ln -s /entry_data/mzn-lib /minizinc/share/minizinc/exec
+
+RUN mkdir /placement
+
 ENV OSMPLA_MESSAGE_DRIVER kafka
 ENV OSMPLA_MESSAGE_HOST kafka
 ENV OSMPLA_MESSAGE_PORT 9092