diff options
| -rw-r--r-- | alpine/java17/pom.xml | 2 | ||||
| -rwxr-xr-x | dependencies/pom.xml | 6 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 4 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 1 | ||||
| -rw-r--r-- | opendaylight/potassium/pom.xml | 35 | ||||
| -rw-r--r-- | opendaylight/potassium/potassium-alpine/pom.xml | 178 | ||||
| -rw-r--r-- | opendaylight/potassium/potassium-alpine/src/main/docker/Dockerfile | 53 | ||||
| -rw-r--r-- | pom.xml | 2 |
8 files changed, 274 insertions, 7 deletions
diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml index 28fed1e2..e45222fb 100644 --- a/alpine/java17/pom.xml +++ b/alpine/java17/pom.xml @@ -97,7 +97,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.34.0</version> + <version>0.39.0</version> <inherited>false</inherited> <configuration> <images> diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 584fef70..cba559b4 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.3.3</version> + <version>2.8.0-SNAPSHOT</version> <scope>import</scope> <type>pom</type> </dependency> @@ -206,7 +206,7 @@ <dependency> <groupId>com.google.j2objc</groupId> <artifactId>j2objc-annotations</artifactId> - <version>1.3</version> + <version>2.8</version> </dependency> <!-- Below is required by com.google.guava : guava : jar : 28.2-jre --> <dependency> @@ -216,7 +216,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <version>2.19.1</version> + <version>2.24.0</version> </dependency> <!-- Kafka Dependency --> <dependency> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index f1702c1a..24d5c74d 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -18,7 +18,7 @@ </organization> <properties> - <base.image.name>onap/ccsdk-odl-argon-alpine-image</base.image.name> + <base.image.name>onap/ccsdk-odl-potassium-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> @@ -535,7 +535,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.34.0</version> + <version>0.39.0</version> <inherited>false</inherited> <configuration> <images> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 6f133380..bd092483 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -17,5 +17,6 @@ <modules> <module>chlorine</module> <module>argon</module> + <module>potassium</module> </modules> </project> diff --git a/opendaylight/potassium/pom.xml b/opendaylight/potassium/pom.xml new file mode 100644 index 00000000..ccfe590d --- /dev/null +++ b/opendaylight/potassium/pom.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-opendaylight</artifactId> + <version>1.7.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-potassium</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: potassium</name> + <description>Creates OpenDaylight container</description> + + <modules> + <module>potassium-alpine</module> + </modules> + + <properties> + <ccsdk.opendaylight.version>0.19.2</ccsdk.opendaylight.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.integration</groupId> + <artifactId>onap-karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> diff --git a/opendaylight/potassium/potassium-alpine/pom.xml b/opendaylight/potassium/potassium-alpine/pom.xml new file mode 100644 index 00000000..6cb59696 --- /dev/null +++ b/opendaylight/potassium/potassium-alpine/pom.xml @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-odl-potassium</artifactId> + <version>1.7.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-potassium-alpine</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: potassium :: docker</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-potassium-alpine-image</image.name> + <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> + <odl.shiro.version>0.18.4</odl.shiro.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>get-odl-distribution</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.opendaylight.integration</groupId> + <artifactId>${odl.karaf.artifactId}</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + <execution> + <id>copy-with-alternalte-repo-2</id> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.highstreet-technologies.aaa</groupId> + <artifactId>aaa-authn-api</artifactId> + <version>${odl.shiro.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory> + <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/odlscripts</directory> + <includes> + <include>*</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.39.0</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <noCache>true</noCache> + <contextDir>${basedir}/target/docker-stage</contextDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> + </tags> + </build> + </image> + </images> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> + </configuration> + <executions> + <execution> + <id>build-push-images</id> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/opendaylight/potassium/potassium-alpine/src/main/docker/Dockerfile b/opendaylight/potassium/potassium-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..45063110 --- /dev/null +++ b/opendaylight/potassium/potassium-alpine/src/main/docker/Dockerfile @@ -0,0 +1,53 @@ +# Prepare stage for multistage image build +## START OF STAGE0 ## +FROM onap/ccsdk-alpine-j17-image:${project.docker.latestfulltag.version} AS stage0 +USER root + +ENV ODL_HOME /opt/opendaylight/current + +# copy the opendaylight tar and expand +COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir -p /opt/odl \ + && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \ + && 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 scratch +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +USER root + +ENV JAVA_HOME=/opt/java/openjdk \ + PATH=$PATH:/opt/java/openjdk/bin \ + ODL_HOME=/opt/opendaylight/current + +# Copy Everything from stage0 +COPY --from=stage0 / / + +USER odl +EXPOSE 8181 +WORKDIR $ODL_HOME +# ENTRYPOINT exec /opt/opendaylight/bin/karaf @@ -31,7 +31,7 @@ <properties> <application.name>distribution</application.name> - <ccsdk.sli.version>1.7.1</ccsdk.sli.version> + <ccsdk.sli.version>1.9.0-SNAPSHOT</ccsdk.sli.version> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> |