summaryrefslogtreecommitdiffstats
path: root/conductor/docker/data
diff options
context:
space:
mode:
authorIkram Ikramullah (ikram@research.att.com) <ikram@research.att.com>2018-03-06 17:27:15 -0500
committerIkram Ikramullah (ikram@research.att.com) <ikram@research.att.com>2018-03-07 16:38:42 -0500
commit186a7c9014441b1bd97843e54220ecabcc863e7e (patch)
treed2c42f785785e8360b34f24d43c125ac85750c75 /conductor/docker/data
parent19d220e1f87475ef762ba7f6fb39d4eb18ee4c20 (diff)
Corrected Docker Files
Note: we've been running conductor/has using the source distribution (sdist) Running the git glone instead of going for the artifacts - will do the sdist based execution soon once the blocker for functional testing is removed. Also, added push script for docker images. Issue-ID: OPTFRA-123 Change-Id: I733113d217157828322ebc2464351abdc0752be6 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
Diffstat (limited to 'conductor/docker/data')
-rwxr-xr-xconductor/docker/data/Dockerfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/conductor/docker/data/Dockerfile b/conductor/docker/data/Dockerfile
index d3836d9..9485644 100755
--- a/conductor/docker/data/Dockerfile
+++ b/conductor/docker/data/Dockerfile
@@ -18,10 +18,8 @@
FROM python:2.7
RUN apt-get update
RUN apt-get --assume-yes install python-setuptools
-RUN virtualenv ../venv
RUN git clone https://gerrit.onap.org/r/optf/has
-WORKDIR ./conductor
-RUN pip install .
-RUN pwd
+WORKDIR ./has/conductor
+RUN pip install -e .
RUN echo "Starting conductor-data"
CMD ["python","/usr/local/bin/conductor-data", "--config-file=/usr/local/bin/conductor.conf"]