From b62ae2e4a975ae0531426d7f02a2face4ca12bfc Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Mon, 13 Jun 2022 05:45:24 +0200 Subject: migrate dist to sulfur-sr0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add odl sulfur dist (djtimoney) Fixed some dependencies to resolve issues in local build, installed odl-restconf-nb-bierman02 karaf package to enable Bierman RESTCONF API support Issue-ID: CCSDK-3695 Signed-off-by: Michael Dürre Change-Id: Ifd98f04f9a68c0c3923802839cdb71e12a115d09 Signed-off-by: Michael Dürre --- alpine/java11/pom.xml | 2 +- alpine/pom.xml | 2 +- ansible-server/pom.xml | 4 +- dependencies/pom.xml | 6 +- dgbuilder-docker/pom.xml | 2 +- dgbuilder/pom.xml | 2 +- odlsli/odlsli-alpine/pom.xml | 6 +- odlsli/pom.xml | 2 +- opendaylight/phosphorus/phosphorus-alpine/pom.xml | 2 +- opendaylight/phosphorus/pom.xml | 2 +- opendaylight/pom.xml | 4 +- opendaylight/silicon/pom.xml | 35 --- opendaylight/silicon/silicon-alpine/pom.xml | 251 --------------------- .../silicon-alpine/src/main/docker/Dockerfile | 60 ----- .../main/resources/framework-4.3.2-features.xml | 74 ------ .../src/main/resources/startup.properties | 24 -- opendaylight/sulfur/pom.xml | 35 +++ opendaylight/sulfur/sulfur-alpine/pom.xml | 178 +++++++++++++++ .../sulfur-alpine/src/main/docker/Dockerfile | 53 +++++ platform-logic/a1Adapter-api/pom.xml | 2 +- platform-logic/asdc-api/pom.xml | 2 +- platform-logic/cMNotify-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/oofpcipoc-api/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/ran-slice-api/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/sliapi/pom.xml | 2 +- pom.xml | 4 +- saltstack-server/pom.xml | 2 +- ubuntu/pom.xml | 2 +- version.properties | 2 +- 32 files changed, 298 insertions(+), 474 deletions(-) delete mode 100644 opendaylight/silicon/pom.xml delete mode 100644 opendaylight/silicon/silicon-alpine/pom.xml delete mode 100644 opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile delete mode 100755 opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml delete mode 100755 opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties create mode 100644 opendaylight/sulfur/pom.xml create mode 100644 opendaylight/sulfur/sulfur-alpine/pom.xml create mode 100644 opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index ca1a9fcb..d014d205 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-j11-alpine diff --git a/alpine/pom.xml b/alpine/pom.xml index a6b78d87..827a2d9a 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-alpine-root diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 6d1068c9..73443bb5 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.ccsdk.distribution ansible-server - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom ccsdk-distribution :: ${project.artifactId} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 9f064a6f..1bbfaeee 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT dependencies @@ -38,10 +38,12 @@ ch.qos.logback logback-classic + ${logback.version} ch.qos.logback logback-core + ${logback.version} com.att.eelf @@ -200,7 +202,7 @@ com.google.errorprone error_prone_annotations - 2.5.1 + 2.11.0 diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index ec8ef65d..748a32e5 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index e53fb285..ba574158 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index a49449b8..8101fa97 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odlsli - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-odlsli-alpine @@ -18,7 +18,7 @@ - onap/ccsdk-odl-phosphorus-alpine-image + onap/ccsdk-odl-sulfur-alpine-image onap/ccsdk-odlsli-alpine-image ${project.version} @@ -33,7 +33,7 @@ 93C4A3FD7BB9C367 - odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040 + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040,odl-restconf-nb-bierman02,odl-controller-blueprint diff --git a/odlsli/pom.xml b/odlsli/pom.xml index f85161a7..42141495 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-odlsli diff --git a/opendaylight/phosphorus/phosphorus-alpine/pom.xml b/opendaylight/phosphorus/phosphorus-alpine/pom.xml index 9abc7ea6..264131ab 100644 --- a/opendaylight/phosphorus/phosphorus-alpine/pom.xml +++ b/opendaylight/phosphorus/phosphorus-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-phosphorus - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-odl-phosphorus-docker diff --git a/opendaylight/phosphorus/pom.xml b/opendaylight/phosphorus/pom.xml index fb39fcde..f7d7525f 100644 --- a/opendaylight/phosphorus/pom.xml +++ b/opendaylight/phosphorus/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-odl-phosphorus diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 55df2940..a2d70f23 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-opendaylight @@ -15,7 +15,7 @@ Creates OpenDaylight container - silicon + sulfur phosphorus diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml deleted file mode 100644 index 9f789c9f..00000000 --- a/opendaylight/silicon/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-opendaylight - 1.4.0-SNAPSHOT - - - distribution-odl-silicon - pom - - ccsdk-distribution :: opendaylight :: silicon - Creates OpenDaylight container - - - silicon-alpine - - - - 0.14.2 - - - - - - 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 deleted file mode 100644 index a353ca9f..00000000 --- a/opendaylight/silicon/silicon-alpine/pom.xml +++ /dev/null @@ -1,251 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-silicon - 1.4.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.5 - 7.3.16 - 2.0.9 - 2.0.14 - 4.3.2 - 1.13.4 - - - - - - - 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-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 - * - - - com.highstreet-technologies.ops4j.pax.web - pax-web-jetty - ${odl.ops4j.version} - ${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version} - pax-web-jetty-${odl.ops4j.version}.jar - * - - - com.highstreet-technologies.netconf - netconf-util - ${odl.netconf.version} - ${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version} - netconf-util-${odl.netconf.version}.jar - * - - - com.highstreet-technologies.netconf - sal-netconf-connector - ${odl.netconf.version} - ${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version} - sal-netconf-connector-${odl.netconf.version}.jar - * - - - org.ops4j.pax.logging - pax-logging-log4j2 - ${patch.pax.logging.version} - ${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version} - pax-logging-log4j2-${patch.pax.logging.version}.jar - * - - - org.ops4j.pax.logging - pax-logging-logback - ${patch.pax.logging.version} - ${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version} - pax-logging-logback-${patch.pax.logging.version}.jar - * - - - org.ops4j.pax.logging - pax-logging-api - ${patch.pax.logging.version} - ${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version} - pax-logging-api-${patch.pax.logging.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 - - - - - - copy-karaf-framework-features - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/resources - - framework-${odl.karaf.framework.version}-features.xml - startup.properties - - true - - - - - - - - - - - - - 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 deleted file mode 100644 index 19cd55f6..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# 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 - -# 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 - - -# Remove vulnerable version of ops4j logging -COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml -COPY startup.properties $ODL_HOME/etc/startup.properties -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version} -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version} -RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version} - -# 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 diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml b/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml deleted file mode 100755 index 52bc1d40..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties b/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties deleted file mode 100755 index 40baf708..00000000 --- a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Bundles to be started on startup, with startlevel -mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2 = 1 -mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5 -mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8 -mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8 -mvn\:org.fusesource.jansi/jansi/1.18 = 8 -mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9 -mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9 -mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9 -mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9 -mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10 -mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2 = 11 -mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11 -mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11 -mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11 -mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.8 = 12 -mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2 = 15 -# The following are added by opendaylight-karaf-resources -mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7 -mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8 -mvn\:org.opendaylight.odlparent/bcprov-framework-ext/8.1.3 = 14 -mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/8.1.3 = 14 -mvn\:org.opendaylight.odlparent/logging-markers/8.1.3 = 14 -mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14 diff --git a/opendaylight/sulfur/pom.xml b/opendaylight/sulfur/pom.xml new file mode 100644 index 00000000..c7f3ce57 --- /dev/null +++ b/opendaylight/sulfur/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 1.4.1-SNAPSHOT + + + distribution-odl-sulfur + pom + + ccsdk-distribution :: opendaylight :: sulfur + Creates OpenDaylight container + + + sulfur-alpine + + + + 0.16.1 + + + + + + org.opendaylight.integration + onap-karaf + ${ccsdk.opendaylight.version} + tar.gz + + + + diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/opendaylight/sulfur/sulfur-alpine/pom.xml new file mode 100644 index 00000000..36a3bc7b --- /dev/null +++ b/opendaylight/sulfur/sulfur-alpine/pom.xml @@ -0,0 +1,178 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-sulfur + 1.4.1-SNAPSHOT + + + distribution-odl-sulfur-docker + pom + + ccsdk-distribution :: opendaylight :: sulfur :: docker + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-sulfur-alpine-image + onap-karaf + 0.15.5 + + + + + + + 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 + + + + + + + + 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/sulfur/sulfur-alpine/src/main/docker/Dockerfile b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..4201b83e --- /dev/null +++ b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile @@ -0,0 +1,53 @@ +# 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 + +# 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 diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index 67d75677..569c8593 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-a1Adapterapi diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 9199cd6b..3048aed9 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-asdcapi diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 56d394d0..69a4fecb 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-cMNotifyai diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 61d43ea8..0627b945 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-installer diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 28bcad2d..959676ac 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-oofpcipocapi diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 9fa26737..97e01b05 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-platform-logic diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index a253d156..b684bd85 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-ranSlice diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 882fe16d..7fe0d604 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index d1575505..12840866 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT platform-logic-sliapi diff --git a/pom.xml b/pom.xml index b6d58d3c..59d18cab 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent oparent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index 3f11bfaf..a25ebcc1 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index e4287803..f2f074d2 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT distribution-ubuntu diff --git a/version.properties b/version.properties index 4b7acda2..4ad71227 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=4 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg