From ea487b181b377bd95f99f961dfb7cbeaea42e26d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 4 Nov 2020 17:06:08 -0500 Subject: [PATCH] Remove java 8 installation Removed java 8 installation from CCSDK base containers. Also, removed obsolete ODL neon docker. Change-Id: I009193b46e8da8a2e53461dcc1ed7d7fce042461 Issue-ID: SDNC-1352 Signed-off-by: Dan Timoney --- alpine/java11/src/main/docker/Dockerfile | 2 +- alpine/java8/pom.xml | 126 ---------- alpine/java8/src/main/docker/Dockerfile | 15 -- alpine/pom.xml | 1 - opendaylight/neon/neon-alpine/pom.xml | 168 ------------- .../neon/neon-alpine/src/main/docker/Dockerfile | 23 -- .../main/odlscripts/configure-cluster-ipdetect.sh | 268 --------------------- .../src/main/odlscripts/configure_cluster.sh | 232 ------------------ .../src/main/odlscripts/custom_shard_config.txt | 17 -- .../src/main/odlscripts/set_persistence.sh | 115 --------- opendaylight/neon/pom.xml | 41 ---- opendaylight/pom.xml | 1 - 12 files changed, 1 insertion(+), 1008 deletions(-) delete mode 100644 alpine/java8/pom.xml delete mode 100644 alpine/java8/src/main/docker/Dockerfile delete mode 100644 opendaylight/neon/neon-alpine/pom.xml delete mode 100644 opendaylight/neon/neon-alpine/src/main/docker/Dockerfile delete mode 100755 opendaylight/neon/neon-alpine/src/main/odlscripts/configure-cluster-ipdetect.sh delete mode 100755 opendaylight/neon/neon-alpine/src/main/odlscripts/configure_cluster.sh delete mode 100755 opendaylight/neon/neon-alpine/src/main/odlscripts/custom_shard_config.txt delete mode 100755 opendaylight/neon/neon-alpine/src/main/odlscripts/set_persistence.sh delete mode 100644 opendaylight/neon/pom.xml diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile index d7077f30..341965d8 100644 --- a/alpine/java11/src/main/docker/Dockerfile +++ b/alpine/java11/src/main/docker/Dockerfile @@ -13,5 +13,5 @@ ENV https_proxy ${HTTPS_PROXY} ENV JAVA_HOME /opt/java/openjdk # Add tools needed for OpenDaylight USER root -RUN apk update && apk --no-cache add bash git maven mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss +RUN apk update && apk --no-cache add bash git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss USER onap \ No newline at end of file diff --git a/alpine/java8/pom.xml b/alpine/java8/pom.xml deleted file mode 100644 index 86da2525..00000000 --- a/alpine/java8/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-alpine-root - 1.1.0-SNAPSHOT - - - distribution-alpine - 1.1.0-SNAPSHOT - pom - - ccsdk-distribution :: alpine - Creates base alpine Docker container - - openECOMP - - - - onap/ccsdk-alpine-image - ${project.version} - ${maven.build.timestamp} - - - - - - - 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 - - - - - - - - - - - - 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 - generate-sources - - build - - - - - push-images - deploy - - build - push - - - - - - - - - - diff --git a/alpine/java8/src/main/docker/Dockerfile b/alpine/java8/src/main/docker/Dockerfile deleted file mode 100644 index 8dde9289..00000000 --- a/alpine/java8/src/main/docker/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# Base alpine with added packages needed for open ecomp -FROM alpine:3.8 -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV http_proxy ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} -ENV https_proxy ${HTTPS_PROXY} - -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk -# Add tools needed for OpenDaylight -RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs python3 graphviz unzip rsync nss \ No newline at end of file diff --git a/alpine/pom.xml b/alpine/pom.xml index 1e1dea2a..ce6e45a0 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -16,7 +16,6 @@ Creates OpenDaylight container - java8 java11 diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml deleted file mode 100644 index a6730fb8..00000000 --- a/opendaylight/neon/neon-alpine/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-neon - 1.1.0-SNAPSHOT - - - distribution-odl-neon-docker - 1.1.0-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight :: neon :: docker - Creates OpenDaylight container - - ONAP - - - - onap/ccsdk-odl-neon-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/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile deleted file mode 100644 index bd6ff4ae..00000000 --- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -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/opendaylight/neon/neon-alpine/src/main/odlscripts/configure-cluster-ipdetect.sh b/opendaylight/neon/neon-alpine/src/main/odlscripts/configure-cluster-ipdetect.sh deleted file mode 100755 index 97d291f2..00000000 --- a/opendaylight/neon/neon-alpine/src/main/odlscripts/configure-cluster-ipdetect.sh +++ /dev/null @@ -1,268 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. -# Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html , or the Apache License, -# Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0 -# -# SPDX-License-Identifier: EPL-1.0 OR Apache-2.0 -# - - -function usage() -{ - # Print any error messages - test "$1" != "" && echo " ERROR: $1" - - # Print standard usage help - cat << EOF - This script is used to configure cluster parameters on this - controller. The user should restart controller to apply changes. - - Usage: $0 - - seed_nodes_list: List of seed nodes, separated by comma or space. - - The script checks that one (any) of the the controller's active IP - addresses is present in the seed_nodes_list. When running this script - on multiple seed nodes, keep the seed_node_list same on all nodes. - - Optionally, shards can be configured in a more granular way by - modifying the file "custom_shard_configs.txt" in the same folder - as this tool. Please see that file for more details. - -This script is currently limited to IPv4 addresses. If you have -problems running this script, please use 'configure_cluster.sh'. - -EOF - - exit 1 -} - - -function start_banner -{ -cat < ${MODULESHARDSCONF} - modules_builder > ${MODULESCONF} - cat ${MODULESCONF} - fi - - echo "Configuring replication type in module-shards.conf" - sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} -} - - -function verify_configuration_files -{ - # Constants - BIN_DIR=`dirname $0` - test ${BIN_DIR} == '.' && BIN_DIR=${PWD} - CONTROLLER_DIR=`dirname ${BIN_DIR}` - CONF_DIR=${CONTROLLER_DIR}/configuration/initial - AKKACONF=${CONF_DIR}/akka.conf - MODULESCONF=${CONF_DIR}/modules.conf - MODULESHARDSCONF=${CONF_DIR}/module-shards.conf - - # Verify configuration files are present in expected location. - if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then - # Check if the configuration files exist in the system - # directory, then copy them over. - ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config - version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml - ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml - ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml - - if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then - cat < - - index: Integer within 1..N, where N is the number of seed nodes. - - seed_nodes_list: List of seed nodes, separated by comma or space. - - The address at the provided index should belong this controller. - When running this script on multiple seed nodes, keep the - seed_node_list same, and vary the index from 1 through N. - - Optionally, shards can be configured in a more granular way by - modifying the file "custom_shard_configs.txt" in the same folder - as this tool. Please see that file for more details - -EOF - - exit 1 -} - - -function start_banner -{ -cat < ${MODULESHARDSCONF} - modules_builder > ${MODULESCONF} - cat ${MODULESCONF} - fi - - echo "Configuring replication type in module-shards.conf" - sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} -} - - -function verify_configuration_files -{ - # Constants - BIN_DIR=`dirname $0` - test ${BIN_DIR} == '.' && BIN_DIR=${PWD} - CONTROLLER_DIR=`dirname ${BIN_DIR}` - CONF_DIR=${CONTROLLER_DIR}/configuration/initial - AKKACONF=${CONF_DIR}/akka.conf - MODULESCONF=${CONF_DIR}/modules.conf - MODULESHARDSCONF=${CONF_DIR}/module-shards.conf - - # Verify configuration files are present in expected location. - if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then - # Check if the configuration files exist in the system - # directory, then copy them over. - ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config - version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml - ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml - ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml - - if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then - cat < - -EOF - - exit 1 -} - - -function end_banner -{ -cat <\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_CLUSTER_CONF=sal-clustering-config-${version}-datastore.cfg - - if [ -f ${ORIG_CONF_DIR}/${ORIG_CLUSTER_CONF} ]; then - cat < - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-opendaylight - 1.1.0-SNAPSHOT - - - distribution-odl-neon - 1.1.0-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight - Creates OpenDaylight container - - - ${project.version} - ${maven.build.timestamp} - 0.10.1 - deploy - - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - - - - - - - neon-alpine - - diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 633ba2c8..3cb64634 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -16,7 +16,6 @@ Creates OpenDaylight container - neon sodium -- 2.16.6