Use integration-java11 Dockerfile
Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC
Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
index 226654d..8408d2f 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
@@ -25,17 +25,14 @@
libffi-dev \
libxml2-dev && \
gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \
- apt-get update -y && \
+ apt-get update -y && apt-get remove bash -y --allow-remove-essential && \
apt-get install -y binutils && apt-get clean && gem cleanup
USER sdc
COPY --chown=sdc:sdc init_keyspaces.cql /home/sdc/
-
COPY --chown=sdc:sdc init_schemas.cql /home/sdc/
-
-COPY --chown=sdc:sdc alter_tables.cql /home/sdc/
-
+COPY --chown=sdc:sdc alter_tables.cql /home/sdc/
COPY --chown=sdc:sdc startup.sh /home/sdc/
RUN chmod 770 /home/sdc/startup.sh
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
index 2f398b2..92bf869 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
cd /home/sdc
@@ -21,7 +21,7 @@
rc=$?
date;
-if [[ $rc != 0 ]]; then
+if [ $rc != 0 ]; then
echo "[Error] Failed to initialize onboard keyspaces";
exit $rc;
fi
@@ -32,7 +32,7 @@
rc=$?
date;
-if [[ $rc != 0 ]]; then
+if [ $rc != 0 ]; then
echo "[Error] Failed to initialize onboard schemas";
exit $rc;
fi