From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Tue, 1 Sep 2020 13:56:41 +0000 (+0200)
Subject: adapt sdnc-image to latest baseimage
X-Git-Tag: 2.0.1~4^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=25db839a60d5cc9db59e8e8b8e0c26c8fc69068c

adapt sdnc-image to latest baseimage

clean up dockerfiles and switch from bash to sh

Issue-ID: SDNC-1342
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I79c5c5d04aa5b4d87f57f4dedc1fc25d34635327
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

Former-commit-id: 61775c18131655bd6c74f25787e621138120ac36
---

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index b5e834f4..577cebb2 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -2,9 +2,6 @@
 ## START OF STAGE0 ##
 FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
-
 USER root
 
 # copy onap
@@ -17,13 +14,10 @@ COPY system /tmp/system
 RUN rsync -a /tmp/system $ODL_HOME
 ## END OF STAGE0 ##
 
-
 FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
 
-MAINTAINER SDN-C Team (sdnc@lists.onap.org)
+LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index ebb0d201..67381f5c 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -1,9 +1,6 @@
 # Prepare stage for multistage image build
 ## START OF STAGE0 ##
-FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
-
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
+FROM onap/ccsdk-odlsli-alpine-image:latest AS stage0
 
 USER root
 
@@ -17,13 +14,12 @@ COPY system /tmp/system
 RUN rsync -a /tmp/system $ODL_HOME
 ## END OF STAGE0 ##
 
+FROM onap/ccsdk-odlsli-alpine-image:latest
 
-FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
-
-MAINTAINER SDN-C Team (sdnc@lists.onap.org)
+LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
+#ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+#ENV ODL_HOME /opt/opendaylight
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
diff --git a/installation/sdnc/src/main/scripts/addA1TrustStore.sh b/installation/sdnc/src/main/scripts/addA1TrustStore.sh
index 4e3fcab6..ae74e5f0 100755
--- a/installation/sdnc/src/main/scripts/addA1TrustStore.sh
+++ b/installation/sdnc/src/main/scripts/addA1TrustStore.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/addIpAddresses.sh b/installation/sdnc/src/main/scripts/addIpAddresses.sh
index 6b9af4df..6a29d475 100755
--- a/installation/sdnc/src/main/scripts/addIpAddresses.sh
+++ b/installation/sdnc/src/main/scripts/addIpAddresses.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 MYSQL_USER=${MYSQL_USER:-sdnctl}
 MYSQL_PWD=${MYSQL_PWD:-gamma}
diff --git a/installation/sdnc/src/main/scripts/addSdncKeyStore.sh b/installation/sdnc/src/main/scripts/addSdncKeyStore.sh
index c6f0e5ae..ea664b75 100755
--- a/installation/sdnc/src/main/scripts/addSdncKeyStore.sh
+++ b/installation/sdnc/src/main/scripts/addSdncKeyStore.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 
diff --git a/installation/sdnc/src/main/scripts/addVnis.sh b/installation/sdnc/src/main/scripts/addVnis.sh
index a8b50eb6..9b526a67 100755
--- a/installation/sdnc/src/main/scripts/addVnis.sh
+++ b/installation/sdnc/src/main/scripts/addVnis.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 MYSQL_USER=${MYSQL_USER:-sdnctl}
 MYSQL_PWD=${MYSQL_PWD:-gamma}
diff --git a/installation/sdnc/src/main/scripts/backupMdsal.sh b/installation/sdnc/src/main/scripts/backupMdsal.sh
index 3aefec28..13eb5ca5 100644
--- a/installation/sdnc/src/main/scripts/backupMdsal.sh
+++ b/installation/sdnc/src/main/scripts/backupMdsal.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 cat > /tmp/daexim-export.json <<-END
 { 
diff --git a/installation/sdnc/src/main/scripts/configure_geo_cluster.sh b/installation/sdnc/src/main/scripts/configure_geo_cluster.sh
index 5fbe0530..b744bbec 100755
--- a/installation/sdnc/src/main/scripts/configure_geo_cluster.sh
+++ b/installation/sdnc/src/main/scripts/configure_geo_cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if [ $# -ne 3 ]; then
    echo "Usage: configure_geo_cluster.sh <member_index{1..6}> <primary_node> <secondary_node>"
diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh
index 1fe10819..9180bc26 100755
--- a/installation/sdnc/src/main/scripts/installFeatures.sh
+++ b/installation/sdnc/src/main/scripts/installFeatures.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/installSdncDb.sh b/installation/sdnc/src/main/scripts/installSdncDb.sh
index 1a403285..d645d4b1 100755
--- a/installation/sdnc/src/main/scripts/installSdncDb.sh
+++ b/installation/sdnc/src/main/scripts/installSdncDb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/installZips.sh b/installation/sdnc/src/main/scripts/installZips.sh
index e8789bee..89ffd08c 100644
--- a/installation/sdnc/src/main/scripts/installZips.sh
+++ b/installation/sdnc/src/main/scripts/installZips.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/restoreMdsal.sh b/installation/sdnc/src/main/scripts/restoreMdsal.sh
index 1f73d776..2bfd9769 100644
--- a/installation/sdnc/src/main/scripts/restoreMdsal.sh
+++ b/installation/sdnc/src/main/scripts/restoreMdsal.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 cat > /tmp/daexim-import.json <<-END
 { 
    "input" : { 
diff --git a/installation/sdnc/src/main/scripts/rmForeignKey.sh b/installation/sdnc/src/main/scripts/rmForeignKey.sh
index 40914fa2..0f70fcd5 100644
--- a/installation/sdnc/src/main/scripts/rmForeignKey.sh
+++ b/installation/sdnc/src/main/scripts/rmForeignKey.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 MYSQL_USER=${MYSQL_USER:-sdnctl}
 MYSQL_PWD=${MYSQL_PWD:-gamma}
diff --git a/installation/sdnc/src/main/scripts/startODL.oom.sh b/installation/sdnc/src/main/scripts/startODL.oom.sh
index 1ce4a1b0..4be69046 100755
--- a/installation/sdnc/src/main/scripts/startODL.oom.sh
+++ b/installation/sdnc/src/main/scripts/startODL.oom.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 86d1e09c..0b7a47c6 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ###
 # ============LICENSE_START=======================================================
diff --git a/installation/sdnc/src/main/scripts/switchVoting.sh b/installation/sdnc/src/main/scripts/switchVoting.sh
index 05d1e0fd..fd16a16d 100755
--- a/installation/sdnc/src/main/scripts/switchVoting.sh
+++ b/installation/sdnc/src/main/scripts/switchVoting.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function usage()
 {