diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2021-10-29 14:47:40 -0400 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2021-11-01 10:17:41 -0400 |
| commit | 5b935a9086ec1080f896b9a71c52283122aa0163 (patch) | |
| tree | f28aee1327e5b6c8ad423dec5950d46f66ac201b /ms/gra/gra-docker/src/main/docker/Dockerfile | |
| parent | 53b2788231f5ab3aeda4f09e1445a02c3a3b6be9 (diff) | |
Sync local changes to support GRA microservice
Sync changes made downstream to support GRA microservice
Change-Id: If3bf5d879f7d61ab91209c63b0344d78128246a8
Issue-ID: CCSDK-3504
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ms/gra/gra-docker/src/main/docker/Dockerfile')
| -rw-r--r-- | ms/gra/gra-docker/src/main/docker/Dockerfile | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/ms/gra/gra-docker/src/main/docker/Dockerfile b/ms/gra/gra-docker/src/main/docker/Dockerfile index 37c2ee6..54e8c1a 100644 --- a/ms/gra/gra-docker/src/main/docker/Dockerfile +++ b/ms/gra/gra-docker/src/main/docker/Dockerfile @@ -1,44 +1,49 @@ # Prepare stage for multistage image build ## START OF STAGE0 ## -FROM @base.image.name@:@ccsdk.docker.version@ AS stage0 +FROM @base.image.name@:@base.image.version@ AS stage0 ENV LOG_PATH /var/log/onap/sdnc -ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config -ENV TRUSTSTORE @onap.truststore@ +ENV SDNC_CONFIG_DIR /opt/sdnc/gra/config +ENV TRUSTSTORE @truststore.file@ ENV JAVA_SECURITY_DIR /opt/java/openjdk/lib/security USER root # copy deliverables to opt COPY opt /opt -# Install ONAP certificates +# Install certificates RUN keytool -importkeystore -srckeystore ${SDNC_CONFIG_DIR}/${TRUSTSTORE} -srcstorepass changeit -destkeystore ${JAVA_SECURITY_DIR}/cacerts -deststorepass changeit -noprompt ## END OF STAGE0 ## -FROM @base.image.name@:@ccsdk.docker.version@ +FROM @base.image.name@:@base.image.version@ MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV PROJECT_VERSION @project.version@ -ENV SDNC_HOME /opt/onap/sdnc -ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config +ENV SDNC_HOME /opt/sdnc/gra +ENV SDNC_CONFIG_DIR /opt/sdnc/gra/config ENV GRA_JAR @sdnc.gra.jar@ -ENV SVCLOGIC_PROPERTIES /opt/onap/sdnc/config/svclogic.properties -ENV SVCLOGIC_DIR /opt/onap/sdnc/svclogic/graphs +ENV SDNC_UID @sdnc.uid@ +ENV SVCLOGIC_PROPERTIES /opt/sdnc/gra/config/svclogic.properties +ENV SVCLOGIC_DIR /opt/sdnc/gra/service-logic/graphs ENV LOG_PATH /var/log/onap/sdnc USER root -# Install sudo and IP utilities -RUN apk update && apk --no-cache add sudo iputils openssl +# Install sudo, IP utilities and openjdk 11 +RUN export http_proxy=http://sub.proxy.att.com:8080 \ + && export https_proxy=http://sub.proxy.att.com:8080 \ + && apk update && apk --no-cache add bash curl mysql-client sudo iputils openssl \ + && unset http_proxy \ + && unset https_proxy # Enable wheel group RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers # Create sdnc user -RUN addgroup -S sdnc && adduser -S sdnc -G sdnc +RUN addgroup -g ${SDNC_UID} -S sdnc && adduser -u ${SDNC_UID} -G sdnc -S sdnc RUN addgroup sdnc wheel COPY --from=stage0 --chown=sdnc:sdnc /opt /opt @@ -48,5 +53,6 @@ RUN chmod +x ${SDNC_HOME}/bin/*.sh USER sdnc WORKDIR ${SDNC_HOME} -ENTRYPOINT /opt/onap/sdnc/bin/startGra.sh +ENTRYPOINT /opt/sdnc/gra/bin/startGra.sh EXPOSE 8443 8080 + |