X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=9d8b379d255f466936d0daddcf1add4dd5ae3767;hp=b9054670126ce23d499831969f108f367e974499;hb=25364ba4d920bbd882abe5117dd170b53b3d54e3;hpb=f4089a2309fecb01e6e3ef06e03991a6be02e2d9 diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index b9054670..9d8b379d 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -22,11 +22,12 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add CCSDK repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +#RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO},${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg # Create odl user -RUN adduser -S odl +RUN addgroup -S odl && adduser -S odl -G odl # Install ansible #COPY ansible-sources.list /etc/apt/sources.list.d @@ -46,9 +47,11 @@ RUN adduser -S odl # copy deliverables to opt -COPY opt /opt -COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg +COPY --chown=odl:odl opt /opt +COPY --chown=odl:odl org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg +RUN chown -R odl:odl /opt +USER odl ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh EXPOSE 8181