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
16 files changed:
## START OF STAGE0 ##
FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
## 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
-
RUN rsync -a /tmp/system $ODL_HOME
## END OF STAGE0 ##
RUN rsync -a /tmp/system $ODL_HOME
## END OF STAGE0 ##
FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
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
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
# Prepare stage for multistage image build
## START OF STAGE0 ##
# 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
RUN rsync -a /tmp/system $ODL_HOME
## END OF STAGE0 ##
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
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
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
cat > /tmp/daexim-export.json <<-END
{
cat > /tmp/daexim-export.json <<-END
{
if [ $# -ne 3 ]; then
echo "Usage: configure_geo_cluster.sh <member_index{1..6}> <primary_node> <secondary_node>"
if [ $# -ne 3 ]; then
echo "Usage: configure_geo_cluster.sh <member_index{1..6}> <primary_node> <secondary_node>"
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
cat > /tmp/daexim-import.json <<-END
{
"input" : {
cat > /tmp/daexim-import.json <<-END
{
"input" : {
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
MYSQL_USER=${MYSQL_USER:-sdnctl}
MYSQL_PWD=${MYSQL_PWD:-gamma}
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================