6 files changed, 12 insertions, 120 deletions
diff --git a/conductor/docker/solver/Dockerfile b/conductor/docker/Dockerfile
index b1a3125..3e1f43c 100755
--- a/conductor/docker/solver/Dockerfile
+++ b/conductor/docker/Dockerfile
@@ -16,10 +16,16 @@
 # -------------------------------------------------------------------------
 
 FROM python:2.7
-RUN apt-get update
-RUN apt-get --assume-yes install python-setuptools
+ENV CON_ADDR "127.0.0.1"
+ENV CON_PORT "8091"
+
+EXPOSE 8091
+
+RUN apt-get update && apt-get --assume-yes install python-setuptools && \
+apt-get install -y unzip && \
+apt-get install -y curl && \
+apt-get install -y wget 
+
 RUN git clone https://gerrit.onap.org/r/optf/has
-WORKDIR ./has/conductor
-RUN pip install -e .
-RUN echo "Starting conductor-solver"
-CMD ["python","/usr/local/bin/conductor-solver", "--config-file=/usr/local/bin/conductor.conf"]
+RUN cd ./has/conductor/ && pip install -e .
+COPY api_paste.ini /usr/local/bin/api_paste.ini
diff --git a/conductor/docker/api/Dockerfile b/conductor/docker/api/Dockerfile
deleted file mode 100755
index 9280c6c..0000000
--- a/conductor/docker/api/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-
-FROM python:2.7
-ENV CON_ADDR "127.0.0.1"
-ENV CON_PORT "8091"
-
-EXPOSE 8091
-
-RUN apt-get update
-RUN apt-get --assume-yes install python-setuptools
-RUN apt-get install -y unzip
-RUN apt-get install -y curl
-RUN apt-get install -y wget
-RUN rm -rf ./has
-RUN git clone https://gerrit.onap.org/r/optf/has
-WORKDIR ./has/conductor/
-#RUN ls 
-RUN pip install -e .
-#COPY ./conductor.conf conductor.conf
-WORKDIR ./has/conductor/docker/api
-COPY api_paste.ini /usr/local/bin/api_paste.ini
-RUN ls 
-CMD ["sh","-c", "python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf"]
diff --git a/conductor/docker/api/api_paste.ini b/conductor/docker/api_paste.ini
index 4299f46..4299f46 100755
--- a/conductor/docker/api/api_paste.ini
+++ b/conductor/docker/api_paste.ini
diff --git a/conductor/docker/controller/Dockerfile b/conductor/docker/controller/Dockerfile
deleted file mode 100755
index 4f9bfdd..0000000
--- a/conductor/docker/controller/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-
-FROM python:2.7
-RUN apt-get update
-RUN apt-get --assume-yes install python-setuptools
-RUN git clone https://gerrit.onap.org/r/optf/has
-WORKDIR ./has/conductor/
-RUN pip install -e .
-RUN echo "Starting conductor-controller"
-CMD ["python","/usr/local/bin/conductor-controller", "--config-file=/usr/local/bin/conductor.conf"]
diff --git a/conductor/docker/data/Dockerfile b/conductor/docker/data/Dockerfile
deleted file mode 100755
index 9485644..0000000
--- a/conductor/docker/data/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-
-FROM python:2.7
-RUN apt-get update
-RUN apt-get --assume-yes install python-setuptools
-RUN git clone https://gerrit.onap.org/r/optf/has
-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"]
diff --git a/conductor/docker/reservation/Dockerfile b/conductor/docker/reservation/Dockerfile
deleted file mode 100755
index 323f15d..0000000
--- a/conductor/docker/reservation/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-
-FROM python:2.7
-RUN apt-get update
-RUN apt-get --assume-yes install python-setuptools
-RUN git clone https://gerrit.onap.org/r/optf/has
-WORKDIR ./has/conductor/
-RUN pip install -e .
-RUN pwd
-RUN echo "Starting conductor-reservation"
-CMD ["python","/usr/local/bin/conductor-reservation", "--config-file=/usr/local/bin/conductor.conf"]