summaryrefslogtreecommitdiffstats
path: root/opendaylight/silicon
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-07-06 16:22:38 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-07-07 17:30:18 +0000
commit9bcf543ede644bf8ca836cfc6d348b0b1df006e3 (patch)
tree3590d305de2dc677c895daa28a95b86eeb02e52b /opendaylight/silicon
parent482a20f6d8812da892c1389fea214afe9b8b2194 (diff)
Little refactoring on Dockerfile and pom.xml
Moving FeaturesRepositories ENV Variable from Dockerfile to pom.xml Moving odl user creation to base image Issue-ID: CCSDK-3358 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I636e54e1849832faef22081a4a28feb6a2325c22
Diffstat (limited to 'opendaylight/silicon')
-rw-r--r--opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile22
1 files changed, 16 insertions, 6 deletions
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