All compnents on Single docker image

Made changes to docker settings to make a single
image instead of multiple. Also made changes to the
run and build scripts to work on this single image.

The data component requires certs, keys and ca bundles
settings too. For this, made changes to the run script.
Also, do to this, added the feature of picking the default
values from the current directory if arguments are
not provided to the run-docker.scripts.

For example: sudo ./run-dockers.sh will run without providing
any arguments to it IF the directory from where it is run
has these files in it.

1. conductor.conf -- configuration file
2. log.conf -- log settings files
3. aai_cert.cer
4. aai_key.key
5. aai_ca_bunlde.pem (pem) file

The first two from the above have been created and provided
in the current directory (has/). However, since certs will
be different from env to env, the last three needs to be provided
either by copying in the current direcotry or as the arguments 3, 4 and 5.

The script will give a detailed message on what may be missing and
how an attempt was made to get the default files. Checkt it out by
playing with run-docker.sh file.

Finally, the build script also calls the push script now. Since
there can be no testing of this in ONAP artifcats prod BEFORE being
merged to master, we can only test the push part once merged to master.

Issue-ID: OPTFRA-123
Change-Id: I83c54c97953b71aae18166b937dd89195e705f73
Signed-off-by: Ikram Ikramullah <ikram@research.att.com>

1 files changed, 0 insertions, 25 deletions

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"]