summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-06-17 15:55:15 +0200
committerhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-06-17 15:55:36 +0200
commit3184da810b196d7e3eb7efe61ea7a7325dbc27f2 (patch)
tree88bebcbfd6900738f76c8561425c412b90343ea5
parent6b108a1ee9757373600688c7aeb7ee7c27f7f699 (diff)
Fix docker build
add path to java Issue-ID: SDNC-1566 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Change-Id: I0bfdf40f0d84641d3b515120c3e911dfac2687f3 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Former-commit-id: 9ca567925d014b1ea492fb065d47d686b7e7c86c
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile2
-rwxr-xr-xinstallation/sdnc/src/main/docker/standalone.Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 4de1bb3f..5a495f2c 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -18,6 +18,7 @@ FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
+ENV PATH=$PATH:/opt/java/openjdk/bin
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
ENV SSL_CERTS_DIR /etc/ssl/certs
@@ -28,7 +29,6 @@ ENV SDNC_KEYPASS ${sdnc.keypass}
ENV SDNC_SECUREPORT ${sdnc.secureport}
USER root
-
COPY --from=stage0 --chown=odl:odl /opt /opt
# Add SDNC repositories to boot repositories
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 03f5eb9b..1dc26cf4 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -18,6 +18,7 @@ FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
+ENV PATH=$PATH:/opt/java/openjdk/bin
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
ENV SSL_CERTS_DIR /etc/ssl/certs