diff options
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 16 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/pom.xml | 12 | ||||
| -rw-r--r-- | odlsli/pom.xml | 5 |
4 files changed, 21 insertions, 17 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 723b088e..2bee0803 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-alpine</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli-alpine</name> @@ -21,11 +21,11 @@ </organization> <properties> - <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name> + <base.image.name>onap/ccsdk-odl-neon-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.features.version>0.5.2</ccsdk.features.version> + <ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <opendaylight.root>opt/opendaylight</opendaylight.root> @@ -36,10 +36,10 @@ <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version> + <ccsdk.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version> </properties> <dependencies> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index 97c5ae4c..024043b6 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -37,9 +37,14 @@ ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} # Install sudo and IP utilities RUN apk update && apk --no-cache add sudo iputils openssl + # Enable wheel group RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers +# Create odl user +RUN addgroup -S odl && adduser -S odl -G odl +RUN addgroup odl wheel + COPY --from=stage0 --chown=odl:odl /opt /opt # Add CCSDK repositories to boot repositories diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 63da0daa..ede48242 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> @@ -25,7 +25,7 @@ <image.name>onap/ccsdk-odlsli-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.features.version>0.5.2</ccsdk.features.version> + <ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <opendaylight.root>opt/opendaylight</opendaylight.root> @@ -36,10 +36,10 @@ <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version> + <ccsdk.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version> </properties> <dependencies> diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 98986b01..0e12e261 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,18 +5,17 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </parent> <artifactId>distribution-odlsli</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli</name> <description>Creates ODLSLI containers</description> <modules> - <module>odlsli-ubuntu</module> <module>odlsli-alpine</module> </modules> </project> |