diff options
| -rw-r--r-- | alpine/java11/src/main/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile index 9a993e91..af1297c0 100644 --- a/alpine/java11/src/main/docker/Dockerfile +++ b/alpine/java11/src/main/docker/Dockerfile @@ -1,7 +1,9 @@ # Base alpine with added packages needed for open ecomp -FROM alpine:3.12 -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +FROM alpine:3.11.3 +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" + +RUN apk update && apk add --no-cache openjdk11 python3 graphviz unzip rsync nss mysql-client nodejs ARG HTTP_PROXY ARG HTTPS_PROXY @@ -10,7 +12,4 @@ ENV http_proxy ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} ENV https_proxy ${HTTPS_PROXY} -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -# Add tools needed for OpenDaylight -RUN apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - && apk update && apk --no-cache add bash git openjdk11 maven mysql-client nodejs python3 graphviz unzip rsync nss
\ No newline at end of file +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
\ No newline at end of file diff --git a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile index ba64a4b7..8c1a780f 100644 --- a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile +++ b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" ENV ODL_HOME /opt/opendaylight/current @@ -12,9 +12,4 @@ RUN mkdir -p /opt/odl \ && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current -# Add missing scripts see SDNC-1056 -#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/ -#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt - -# ENTRYPOINT exec /opt/opendaylight/bin/karaf EXPOSE 8181 |