diff options
Diffstat (limited to 'cmso-optimizer/src/main/docker')
| -rw-r--r-- | cmso-optimizer/src/main/docker/Dockerfile | 19 | ||||
| -rw-r--r-- | cmso-optimizer/src/main/docker/assembly/cmso-files.xml | 7 |
2 files changed, 25 insertions, 1 deletions
diff --git a/cmso-optimizer/src/main/docker/Dockerfile b/cmso-optimizer/src/main/docker/Dockerfile index 9ef42ab..fde2caf 100644 --- a/cmso-optimizer/src/main/docker/Dockerfile +++ b/cmso-optimizer/src/main/docker/Dockerfile @@ -10,10 +10,26 @@ ENV HTTPS_PROXY=$https_proxy ENV http_proxy=$HTTP_PROXY ENV https_proxy=$HTTPS_PROXY +ENV MZN 2.2.3 +ENV MZN_BASENAME MiniZincIDE-${MZN}-bundle-linux-x86_64 +ENV MZN_UNZIPNAME MiniZincIDE-${MZN}-bundle-linux +ENV MZN_GH_BASE https://github.com/MiniZinc/MiniZincIDE +ENV MZN_DL_URL ${MZN_GH_BASE}/releases/download/${MZN}/${MZN_BASENAME}.tgz + RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true && \ apt-get update && \ apt-get -y dist-upgrade && \ - apt-get install -y openjdk-8-jre-headless + apt-get install -y openjdk-8-jre-headless && \ + apt-get install wget + + +# Minizinc +RUN wget -q $MZN_DL_URL -O mz.tgz +RUN tar xzf mz.tgz +RUN mv $MZN_UNZIPNAME /mz-dist +RUN rm mz.tgz +RUN echo PATH=/mz-dist:$PATH >> ~/.bashrc + COPY onap-cmso-optimizer/cmso-optimizer.jar ${APP_HOME}/app.jar @@ -23,6 +39,7 @@ VOLUME /share/debug-logs COPY onap-cmso-optimizer/startService.sh ${APP_HOME}/startService.sh COPY onap-cmso-optimizer/data ${APP_HOME}/data +COPY onap-cmso-optimizer/scripts ${APP_HOME}/scripts RUN chmod 700 ${APP_HOME}/startService.sh RUN ln -s /share/etc ${APP_HOME}/etc diff --git a/cmso-optimizer/src/main/docker/assembly/cmso-files.xml b/cmso-optimizer/src/main/docker/assembly/cmso-files.xml index 2e3f19e..cf96a35 100644 --- a/cmso-optimizer/src/main/docker/assembly/cmso-files.xml +++ b/cmso-optimizer/src/main/docker/assembly/cmso-files.xml @@ -44,6 +44,13 @@ <outputDirectory>/data</outputDirectory> </fileSet> <fileSet> + <includes> + <include>**</include> + </includes> + <directory>scripts</directory> + <outputDirectory>/scripts</outputDirectory> + </fileSet> + <fileSet> <directory>${project.basedir}/src/main/resources</directory> <outputDirectory>./resources</outputDirectory> <includes> |