From b1ac7253c276b1848a37f8e16d8aab93e643a97e Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 14 Dec 2018 13:00:43 -0500 Subject: Port ODL Oxygen to alpine Add new alpine-based images for OpenDaylight Oxygen container. Change-Id: I49eb198e39a4dd71736175876e2e1af0a85d5228 Issue-ID: CCSDK-841 Signed-off-by: Timoney, Dan (dt5972) --- odlsli/src/main/docker/Dockerfile | 53 ----------------------------------- odlsli/src/main/resources/odlsli.dump | 2 ++ 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 odlsli/src/main/docker/Dockerfile (limited to 'odlsli/src') diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile deleted file mode 100644 index 8ba16f01..00000000 --- a/odlsli/src/main/docker/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odl-oxygen-image:${project.version} -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -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_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} - -# 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 && rm -rf /tmp/system - -# 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 cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -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 echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg - -# Create odl user -RUN useradd odl - -# Install ansible -#COPY ansible-sources.list /etc/apt/sources.list.d -#RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv ${ANSIBLE_GPG_KEY} && \ -# gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \ -# apt-get update && \ -# apt-get install -y ansible - -# Install ansible-opendaylight -#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight - -# Copy ccsdk install playbook -#COPY install_ccsdk.yml /tmp - -# Install features in ODL -#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml - - -# copy deliverables to opt -COPY opt /opt -COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg - - -ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh -EXPOSE 8181 diff --git a/odlsli/src/main/resources/odlsli.dump b/odlsli/src/main/resources/odlsli.dump index 6f8217c4..e6b6222a 100644 --- a/odlsli/src/main/resources/odlsli.dump +++ b/odlsli/src/main/resources/odlsli.dump @@ -865,6 +865,8 @@ CREATE TABLE `SVC_LOGIC` ( `mode` varchar(5) NOT NULL, `active` varchar(1) NOT NULL, `graph` longblob, + `modified_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `md5sum` varchar(128) DEFAULT NULL, PRIMARY KEY (`module`,`rpc`,`version`,`mode`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; -- cgit 1.2.3-korg