From 94a7c372094fb6c8f342dfd04984a34c975eb849 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 9 Jun 2021 12:14:54 -0400 Subject: Making changes as per SILICON ODL Adding few dependencies and refactoring sli versioning Issue-ID: CCSDK-3331 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I9678e4b4401791a98499ab3c39ef5b24e404aea8 --- opendaylight/silicon/pom.xml | 35 ++++ opendaylight/silicon/silicon-alpine/pom.xml | 186 +++++++++++++++++++++ .../silicon-alpine/src/main/docker/Dockerfile | 38 +++++ 3 files changed, 259 insertions(+) create mode 100644 opendaylight/silicon/pom.xml create mode 100644 opendaylight/silicon/silicon-alpine/pom.xml create mode 100644 opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile (limited to 'opendaylight/silicon') 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 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 1.2.0-SNAPSHOT + + + distribution-odl-silicon + pom + + ccsdk-distribution :: opendaylight :: silicon + Creates OpenDaylight container + + + silicon-alpine + + + + 0.14.0 + + + + + + org.opendaylight.integration + onap-karaf + ${ccsdk.opendaylight.version} + tar.gz + + + + 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 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-silicon + 1.2.0-SNAPSHOT + + + distribution-odl-silicon-docker + pom + + ccsdk-distribution :: opendaylight :: silicon :: docker + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-silicon-alpine-image + onap-karaf + 0.13.2 + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../../src/main/scripts/TagVersion.groovy + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + ${odl.karaf.artifactId} + ${ccsdk.opendaylight.version} + tar.gz + true + ${basedir}/target/docker-stage + + + false + true + true + + + + copy-with-alternalte-repo-2 + generate-sources + + copy + + + + + com.highstreet-technologies.aaa + aaa-shiro + ${odl.shiro.version} + ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version} + aaa-shiro-${odl.shiro.version}.jar + * + + + com.highstreet-technologies.aaa + aaa-authn-api + ${odl.shiro.version} + ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version} + aaa-authn-api-${odl.shiro.version}.jar + * + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + src/main/odlscripts + + * + + false + + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + true + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + ${docker.verbose} + ${docker.skip.push} + + + + build-push-images + + build + push + + + + + + + + + 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 -- cgit 1.2.3-korg