summaryrefslogtreecommitdiffstats
path: root/cmso-optimizer/src
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-07-26 12:48:41 -0400
committerJerry Flood <jflood@att.com>2019-07-26 12:48:56 -0400
commit05d1e18373779df333d1f1fa30cc4891a8da59a4 (patch)
tree1477ee93ac6c3e618926ed009fe6cdd19dce9207 /cmso-optimizer/src
parent8d79b30fed898ede2b551a579e3564cb196f707b (diff)
Cleanup POMs and Dockerfiles
Issue-ID: OPTFRA-539 Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659 Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-optimizer/src')
-rw-r--r--cmso-optimizer/src/main/docker/Dockerfile36
1 files changed, 18 insertions, 18 deletions
diff --git a/cmso-optimizer/src/main/docker/Dockerfile b/cmso-optimizer/src/main/docker/Dockerfile
index fde2caf..7ce5303 100644
--- a/cmso-optimizer/src/main/docker/Dockerfile
+++ b/cmso-optimizer/src/main/docker/Dockerfile
@@ -3,10 +3,11 @@ FROM ubuntu:16.04
MAINTAINER "The Onap Team"
LABEL Description="This image contains ubuntu 16.04 with the openjdk installed" Version="16.04-8"
ENV APP_HOME=/opt/app/cmso
-ARG http_proxy
-ARG https_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV HTTPS_PROXY=$https_proxy
+
+ARG http_proxy_arg
+ARG https_proxy_arg
+ENV HTTP_PROXY=$http_proxy_arg
+ENV HTTPS_PROXY=$https_proxy_arg
ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
@@ -16,19 +17,18 @@ 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 && \
+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 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
+ apt-get install -y wget && \
+ apt-get install -y curl && \
+ set && \
+ wget -q $MZN_DL_URL -O mz.tgz && \
+ tar xzf mz.tgz && \
+ mv $MZN_UNZIPNAME /mz-dist && \
+ rm mz.tgz && \
+ echo PATH=/mz-dist:$PATH >> ~/.bashrc
COPY onap-cmso-optimizer/cmso-optimizer.jar ${APP_HOME}/app.jar
@@ -41,10 +41,10 @@ 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
-RUN ln -s /share/logs ${APP_HOME}/logs
-RUN ln -s /share/debug-logs ${APP_HOME}/debug-logs
+RUN chmod 700 ${APP_HOME}/startService.sh && \
+ ln -s /share/etc ${APP_HOME}/etc && \
+ ln -s /share/logs ${APP_HOME}/logs && \
+ ln -s /share/debug-logs ${APP_HOME}/debug-logs
WORKDIR ${APP_HOME}
ENTRYPOINT ./startService.sh