From: Dan Timoney Date: Mon, 23 Mar 2020 18:58:06 +0000 (-0400) Subject: Create base Sodium image X-Git-Tag: 1.0.0~26 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=1de136123f864a62052f7babf18ddb45e870ec54 Create base Sodium image Create base ODL Sodium docker image Change-Id: Ibfc259529ffeb90d73ea897f9a2ae7a1a79a6b79 Issue-ID: CCSDK-2184 Signed-off-by: Dan Timoney --- diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 0d5ba1d5..a7ec8cd7 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -38,11 +38,11 @@ ${odl.features.extra},${ccsdk.odl.features} - 0.7.2 - 0.7.1 - 0.7.1 - 0.7.1 - 0.7.1 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 4ed68858..4c121a72 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -17,5 +17,6 @@ neon + sodium diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml new file mode 100644 index 00000000..dfe1c1e5 --- /dev/null +++ b/opendaylight/sodium/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-opendaylight + 1.0.0-SNAPSHOT + + + distribution-odl-sodium + 1.0.0-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight + Creates OpenDaylight container + + + ${project.version} + ${maven.build.timestamp} + 0.11.2 + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + + + + + + sodium-alpine + + diff --git a/opendaylight/sodium/sodium-alpine/pom.xml b/opendaylight/sodium/sodium-alpine/pom.xml new file mode 100644 index 00000000..6b8129d6 --- /dev/null +++ b/opendaylight/sodium/sodium-alpine/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-sodium + 1.0.0-SNAPSHOT + + + distribution-odl-sodium-docker + 1.0.0-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight :: sodium :: docker + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-sodium-alpine-image + onap-karaf + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + 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.28.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-images + package + + build + + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + + + diff --git a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..be35e54f --- /dev/null +++ b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile @@ -0,0 +1,23 @@ +FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version} +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV ODL_HOME /opt/opendaylight/current + +# make python2 also available up until OpenDaylight migrates to python3 +RUN apk add --no-cache py2-pip + +# copy the opendaylight tar and expand +COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir -p /opt/odl \ + && tar zxvf /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 + +# 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 + +# ENTRYPOINT exec /opt/opendaylight/bin/karaf +EXPOSE 8181 diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 0221bac3..4f3347d4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -14,6 +14,10 @@ ccsdk-distribution :: platform-logic :: ${project.artifactId} Contains platform-level service logic installer + + + 1.0.0-SNAPSHOT + diff --git a/sliboot/pom.xml b/sliboot/pom.xml new file mode 100644 index 00000000..38e4fc98 --- /dev/null +++ b/sliboot/pom.xml @@ -0,0 +1,356 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + springboot/artifactId> + 2.0.0-SNAPSHOT + + + + org.onap.ccsdk.distribution + distribution-sliboot + 1.0.0-SNAPSHOT + pom + + ccsdk-distribution :: sliboot + Creates Springboot-based Docker container + + ONAP + + + + onap/ccsdk-alpine-image + onap/ccsdk-sliboot-alpine-image + ${project.version} + ${maven.build.timestamp} + ${https_proxy} + yyyyMMdd'T'HHmmss'Z' + deploy + true + + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + + + + + org.onap.ccsdk.sli.core + sliapi-springboot + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + filters-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + sli-installer + ${ccsdk.sli.core.version} + repo + zip + + + + + + + + org.apache.maven.wagon + wagon-http-lightweight + 2.2 + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../../src/main/scripts/TagVersion.groovy + + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + copy-scripts + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/bin + + + ../src/main/scripts + + *.sh + + false + + + + + + + copy-odl-resources + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + ../src/main/resources + + idmlight.db.mv.db + org.ops4j.pax.logging.cfg + install_ccsdk.yml + ansible-sources.list + + false + + + + + + copy-config + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + ../src/main/resources + + org.ops4j.pax.logging.cfg + + false + + + + + + copy-data + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data + + + ../src/main/resources + + *.dump + + false + + + + + + copy-properties + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties + + + + ../src/main/properties + + *.properties + *.vt + + false + + + + + + copy-keystores + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores + + + ../src/main/stores + + *.jks + + false + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + + unpack features + generate-sources + + unpack-dependencies + + + ${basedir}/target/docker-stage + true + + + + unpack dgs + generate-sources + + unpack + + + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + ${project.groupId} + platform-logic-installer + ${project.version} + zip + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/ccsdk + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-images + package + + build + + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + diff --git a/sliboot/src/main/docker/Dockerfile b/sliboot/src/main/docker/Dockerfile new file mode 100644 index 00000000..024043b6 --- /dev/null +++ b/sliboot/src/main/docker/Dockerfile @@ -0,0 +1,57 @@ +# Prepare stage for multistage image build +## START OF STAGE0 ## +FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0 + +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV ODL_HOME /opt/opendaylight + +# copy the opendaylight credentials +COPY idmlight.db.mv.db $ODL_HOME/data + +# copy CCSDK mvn artifacts to ODL repository +COPY system /tmp/system +RUN rsync -a /tmp/system $ODL_HOME + +# copy deliverables to opt +COPY opt /opt +COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg +## END OF STAGE0 ## + + +FROM ${base.image.name}:${project.docker.latestfulltag.version} + +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) + +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV ODL_HOME /opt/opendaylight +ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties +ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features +ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features +ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features +ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features +ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features +ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features +ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} +ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} + +# Install sudo and IP utilities +RUN apk update && apk --no-cache add sudo iputils openssl + + +# Enable wheel group +RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers + +# Create odl user +RUN addgroup -S odl && adduser -S odl -G odl +RUN addgroup odl wheel + +COPY --from=stage0 --chown=odl:odl /opt /opt + +# Add CCSDK repositories to boot repositories +RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig +RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg + +USER odl +ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh +EXPOSE 8181