summaryrefslogtreecommitdiffstats
path: root/conductor
diff options
context:
space:
mode:
authorIkram Ikramullah <ikram@research.att.com>2019-04-25 14:08:30 -0400
committerIkram Ikramullah <ikram@research.att.com>2019-04-25 14:20:55 -0400
commita57cb7ccf199061067b009a472b30ea7ad023d6a (patch)
tree2a36b069b57d27599d616a1909e6754bdd6fd019 /conductor
parentd6be402c0765aee388bc5dc64882696a0a23be22 (diff)
Added the missing arguments required for image building
Change-Id: Ibe8dab7327485d06d5632e27879291282530c22f Issue-ID: OPTFRA-461 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
Diffstat (limited to 'conductor')
-rw-r--r--conductor/docker/Dockerfile25
1 files changed, 16 insertions, 9 deletions
diff --git a/conductor/docker/Dockerfile b/conductor/docker/Dockerfile
index b7528d8..e5253c5 100644
--- a/conductor/docker/Dockerfile
+++ b/conductor/docker/Dockerfile
@@ -16,9 +16,18 @@
# -------------------------------------------------------------------------
FROM python:2.7.15-alpine
-ENV CON_PORT "8091"
-EXPOSE 8091
+
+ARG MVN_ARTIFACT_VERSION
+ARG REPO
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+ENV CON_ADDR "127.0.0.1"
+ENV CON_PORT "8091"
+EXPOSE ${CON_PORT}
RUN mkdir -p /etc/nginx/ssl && \
mkdir -p /var/log/conductor && \
@@ -38,15 +47,13 @@ RUN pip install --upgrade pip
RUN apk add --virtual build-dependencies build-base linux-headers pcre-dev libffi-dev libxslt-dev libressl-dev
RUN pip install uwsgi
-#Please leave teh following commmented out line in for test on local clusters
-#RUN wget -O /tmp/has.zip "https://nexus.onap.org/service/local/repositories/autorelease-121393/content/org/onap/optf/has/optf-has-conductor/1.2.5/optf-has-conductor-1.2.5.zip" && \
-RUN wget -O /tmp/has.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.optf.has&a=optf-has-conductor&e=zip&v=${MVN_ARTIFACT_VERSION}" && \
- unzip -q -o -B /tmp/has.zip -d /tmp/has && \
- rm -f /tmp/has.zip
+RUN wget -O /opt/has.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.optf.has&a=optf-has-conductor&e=zip&v=${MVN_ARTIFACT_VERSION}" && \
+ unzip -q -o -B /opt/has.zip -d /opt/has && \
+ rm -f /opt/has.zip
#PKG-INFO file must also exists in the conductor folder (i.e. besides and inside the of_has.egg-info folder). The zip file for distro above is missing it
-RUN cp /tmp/has/conductor/of_has.egg-info/PKG-INFO /tmp/has/conductor
-RUN pip install -e /tmp/has/conductor
+RUN cp /opt/has/conductor/of_has.egg-info/PKG-INFO /opt/has/conductor
+RUN pip install -e /opt/has/conductor
COPY app.wsgi /etc/nginx/conductor.wsgi
COPY api_paste.ini /usr/local/etc/conductor/api_paste.ini