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 --- opendaylight/sulfur/sulfur-alpine/pom.xml | 178 +++++++++++++++++++++ .../sulfur-alpine/src/main/docker/Dockerfile | 53 ++++++ 2 files changed, 231 insertions(+) create mode 100644 opendaylight/sulfur/sulfur-alpine/pom.xml create mode 100644 opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile (limited to 'opendaylight/sulfur/sulfur-alpine') 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 -- cgit 1.2.3-korg