diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-05-10 15:47:30 -0700 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2018-05-11 10:05:45 -0700 |
| commit | eb60ad19e55a1ff53ca884d15c81f018ad7431cc (patch) | |
| tree | cc3c8e421cb806f5c62d1c78d63a476857e164f9 /ocata/docker | |
| parent | 408bbd742c250bf66611c577eb3af4496b70d525 (diff) | |
Add console logging output
The log.yml is configured to place the log entries in a file to be
collected by the ONAP logging project. But for containerized
deployments, it's better to place then into the standard output. This
commit adds the console log handler.
Change-Id: If325780c1739490adeb731dfbd13e2f1b8a9e3f4
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-214
Diffstat (limited to 'ocata/docker')
| -rw-r--r-- | ocata/docker/Dockerfile | 25 | ||||
| -rw-r--r-- | ocata/docker/build_image.sh | 8 |
2 files changed, 13 insertions, 20 deletions
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile index 8688328f..cca1cf89 100644 --- a/ocata/docker/Dockerfile +++ b/ocata/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2 +FROM python:2.7 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -10,23 +10,20 @@ ENV MSB_ADDR "127.0.0.1" ENV MSB_PORT "80" ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" ENV AAI_PORT "8443" -ENV AAI_SERVICE_URL +ENV AAI_SERVICE_URL "" ENV AAI_SCHEMA_VERSION "v13" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" EXPOSE 9006 -# COPY ./ /opt/ocata/ -RUN apt-get update && \ - apt-get install -y memcached && \ - apt-get install -y unzip && \ - cd /opt/ && \ - wget -O multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=LATEST" && \ - unzip -q -o -B multicloud-openstack-ocata.zip && \ - chmod +x /opt/ocata/*.sh && \ - rm -f multicloud-openstack-ocata.zip && \ - pip install -r /opt/ocata/requirements.txt - WORKDIR /opt/ocata -CMD /bin/sh -c /opt/ocata/run.sh +RUN apt-get update && apt-get install -y memcached unzip +RUN wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=LATEST" && \ + unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \ + rm -f /opt/multicloud-openstack-ocata.zip +RUN mkdir -p /var/log/onap/multicloud/openstack/ocata/ +#COPY ./ . +RUN pip install -r requirements.txt + +CMD "/opt/ocata/run.sh" diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh index c85989d0..8e55f89f 100644 --- a/ocata/docker/build_image.sh +++ b/ocata/docker/build_image.sh @@ -5,13 +5,9 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -ORG="onap" VERSION="1.1.2-SNAPSHOT" STAGING="1.1.2-STAGING" -PROJECT="multicloud" -IMAGE="openstack-ocata" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" +IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}" if [ $HTTP_PROXY ]; then BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" @@ -31,4 +27,4 @@ function push_image { } build_image -push_image
\ No newline at end of file +push_image |