diff options
| author |   Shankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com> | 2018-07-19 15:34:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-19 15:34:55 +0000 |
| commit | 1d048cfce20317c3beb85519c198e8d114b1c819 (patch) | |
| tree | 6ca2b9b033f2de8037cf8ed525a9d0e5e168008f | |
| parent | cd21d4484b3e46e78998ef5de90ad1fde88a62e6 (diff) | |
| parent | b2a5b2cdc47b73eb4a82963d493910930c9d0db7 (diff) | |
Merge "Fix Dockerfile for beijing"
| -rwxr-xr-x | conductor/docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | run-dockers.sh | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/conductor/docker/Dockerfile b/conductor/docker/Dockerfile index 3e1f43c..693e458 100755 --- a/conductor/docker/Dockerfile +++ b/conductor/docker/Dockerfile @@ -26,6 +26,7 @@ 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 +RUN git clone https://gerrit.onap.org/r/optf/has \ + && git checkout beijing RUN cd ./has/conductor/ && pip install -e . COPY api_paste.ini /usr/local/bin/api_paste.ini diff --git a/run-dockers.sh b/run-dockers.sh index 087c92c..cd8f763 100755 --- a/run-dockers.sh +++ b/run-dockers.sh @@ -5,7 +5,6 @@ BUILD_ARGS="--no-cache" ORG="onap" VERSION="1.1.1" -STAGING="1.1.1-STAGING" PROJECT="optf-has" DOCKER_REPOSITORY="nexus3.onap.org:10003" IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}" @@ -51,6 +50,7 @@ function get_from_arguments_or_default(){ exit 0; fi } + #conductor.conf if [ -z "$1" ] then @@ -86,9 +86,9 @@ fi echo Value is .... $COND_CONF $LOG_FILE echo Attempting to run multiple containers on image .... ${IMAGE_NAME} docker login -u anonymous -p anonymous ${DOCKER_REPOSITORY} -docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf -docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf -docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf -docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf -docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf +docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:${VERSION} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf +docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:${VERSION} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf +docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:${VERSION} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf +docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:${VERSION} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf +docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${VERSION} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf |