diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-09 12:14:54 -0400 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-06-14 14:03:25 +0000 |
commit | 94a7c372094fb6c8f342dfd04984a34c975eb849 (patch) | |
tree | 59374117a3786da069a28daa1488cf6dd73f52f0 /opendaylight/silicon | |
parent | fff64f89ef68f9f6a31d462507495115b81c04f9 (diff) |
Making changes as per SILICON ODL
Adding few dependencies and refactoring sli versioning
Issue-ID: CCSDK-3331
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I9678e4b4401791a98499ab3c39ef5b24e404aea8
Diffstat (limited to 'opendaylight/silicon')
-rw-r--r-- | opendaylight/silicon/pom.xml | 35 | ||||
-rw-r--r-- | opendaylight/silicon/silicon-alpine/pom.xml | 186 | ||||
-rw-r--r-- | opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile | 38 |
3 files changed, 259 insertions, 0 deletions
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml new file mode 100644 index 00000000..45107bf0 --- /dev/null +++ b/opendaylight/silicon/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.2.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-silicon</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: silicon</name> + <description>Creates OpenDaylight container</description> + + <modules> + <module>silicon-alpine</module> + </modules> + + <properties> + <ccsdk.opendaylight.version>0.14.0</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/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml new file mode 100644 index 00000000..414f3766 --- /dev/null +++ b/opendaylight/silicon/silicon-alpine/pom.xml @@ -0,0 +1,186 @@ +<?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-silicon</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-silicon-docker</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: silicon :: docker</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name> + <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> + <odl.shiro.version>0.13.2</odl.shiro.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</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-shiro</artifactId> + <version>${odl.shiro.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory> + <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <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.34.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/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..9c8099a3 --- /dev/null +++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile @@ -0,0 +1,38 @@ +# Prepare stage for multistage image build +## START OF STAGE0 ## +FROM onap/ccsdk-alpine-j11-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 + +# 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 + +## END OF STAGE0 ## + + +## This will create actual image +FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +USER root + +ENV ODL_HOME /opt/opendaylight/current + +COPY --from=stage0 /opt /opt + +# ENTRYPOINT exec /opt/opendaylight/bin/karaf +WORKDIR $ODL_HOME +USER onap +EXPOSE 8181 |