diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-07-06 16:22:38 -0400 |
|---|---|---|
| committer | KAPIL SINGAL <ks220y@att.com> | 2021-07-07 17:30:18 +0000 |
| commit | 9bcf543ede644bf8ca836cfc6d348b0b1df006e3 (patch) | |
| tree | 3590d305de2dc677c895daa28a95b86eeb02e52b /odlsli/odlsli-alpine | |
| parent | 482a20f6d8812da892c1389fea214afe9b8b2194 (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 'odlsli/odlsli-alpine')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 9 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 21 |
2 files changed, 12 insertions, 18 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 9216c04e..d5ad38b4 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -31,12 +31,21 @@ <opendaylight.root>opt/opendaylight</opendaylight.root> <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> + <!-- ODL Features Boot --> <extra.odl.features> odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040 </extra.odl.features> + <!-- SLI Features Boot --> <ccsdk.sli.features> ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all </ccsdk.sli.features> + <!-- SLI Features Repositories --> + <ccsdk.sli.features.repo> + mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features,\ + mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features,\ + mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\ + mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features + </ccsdk.sli.features.repo> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> </properties> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index fd1a7598..e1d3813b 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -14,25 +14,10 @@ RUN rsync -a /tmp/system $ODL_HOME COPY opt /opt COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg -# CCSDK SLI FEATURES -ENV CCSDK_SLI_FEATURES_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features,\ -mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features,\ -mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\ -mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features - -# ODL and CCSDK SLI featuresBoot defined in pom.xml -ENV ODL_BOOT_FEATURES_EXTRA ${extra.odl.features},${ccsdk.sli.features} - -# Backing up existing karaf cfg and updating features boot and features repository +# Backing up existing karaf cfg and updating features boot and features repositories defined in pom.xml RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN sed -i -e "\|featuresRepositories|s|$|,${CCSDK_SLI_FEATURES_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg - -# 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 +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${extra.odl.features},${ccsdk.sli.features}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${ccsdk.sli.features.repo}|" $ODL_HOME/etc/org.apache.karaf.features.cfg # Changing ownership and permission of /opt RUN chown -R odl:odl /opt && chmod -R 755 /opt |