diff options
Diffstat (limited to 'opendaylight')
| -rw-r--r-- | opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile | 26 | ||||
| -rw-r--r-- | opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile | 22 |
2 files changed, 36 insertions, 12 deletions
diff --git a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile index 9c8099a3..978a0919 100644 --- a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile +++ b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile @@ -14,25 +14,39 @@ RUN mkdir -p /opt/odl \ && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current +# Enable wheel and create a group and user +RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \ + && addgroup -S odl \ + && adduser -S odl -G odl \ + && addgroup odl wheel + # Patch some opendaylight artifacts COPY system $ODL_HOME/system + # 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 +# Changing ownership and permission of /opt +RUN chown -R odl:odl /opt && chmod -R 755 /opt + ## END OF STAGE0 ## +################################################# ## This will create actual image -FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} +FROM scratch MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) USER root -ENV ODL_HOME /opt/opendaylight/current +ENV JAVA_HOME=/opt/java/openjdk \ + PATH=$PATH:/opt/java/openjdk/bin \ + ODL_HOME=/opt/opendaylight/current -COPY --from=stage0 /opt /opt +# Copy Everything from stage0 +COPY --from=stage0 / / -# ENTRYPOINT exec /opt/opendaylight/bin/karaf -WORKDIR $ODL_HOME -USER onap +USER odl EXPOSE 8181 +WORKDIR $ODL_HOME +# ENTRYPOINT exec /opt/opendaylight/bin/karaf diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile index 7a7bf403..978a0919 100644 --- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile +++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile @@ -14,12 +14,22 @@ RUN mkdir -p /opt/odl \ && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current +# Enable wheel and create a group and user +RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \ + && addgroup -S odl \ + && adduser -S odl -G odl \ + && addgroup odl wheel + # Patch some opendaylight artifacts COPY system $ODL_HOME/system + # 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 +# Changing ownership and permission of /opt +RUN chown -R odl:odl /opt && chmod -R 755 /opt + ## END OF STAGE0 ## ################################################# @@ -29,14 +39,14 @@ FROM scratch MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) USER root -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $PATH:/opt/java/openjdk/bin -ENV ODL_HOME /opt/opendaylight/current +ENV JAVA_HOME=/opt/java/openjdk \ + PATH=$PATH:/opt/java/openjdk/bin \ + ODL_HOME=/opt/opendaylight/current # Copy Everything from stage0 COPY --from=stage0 / / -# ENTRYPOINT exec /opt/opendaylight/bin/karaf -WORKDIR $ODL_HOME -USER onap +USER odl EXPOSE 8181 +WORKDIR $ODL_HOME +# ENTRYPOINT exec /opt/opendaylight/bin/karaf |