diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2020-09-21 22:13:05 +0200 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-05-12 10:27:10 +0000 |
| commit | df353be353e1ec25ac2a0e64a9eb617dcbc87703 (patch) | |
| tree | e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a /openecomp-be/dist/sdc-onboard-db-init-docker/artifacts | |
| parent | 936781153118364e60662529dbd7217416a26148 (diff) | |
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>
Diffstat (limited to 'openecomp-be/dist/sdc-onboard-db-init-docker/artifacts')
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile | 7 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh | 6 |
2 files changed, 5 insertions, 8 deletions
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 226654ddc3..8408d2f51c 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 @@ RUN apt-get update && apt-get install -y python-pip && \ 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 2f398b2f91..92bf869ccc 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 @@ cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_keyspaces.cql $CS_HOST $CS_PORT rc=$? date; -if [[ $rc != 0 ]]; then +if [ $rc != 0 ]; then echo "[Error] Failed to initialize onboard keyspaces"; exit $rc; fi @@ -32,7 +32,7 @@ cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_schemas.cql $CS_HOST $CS_PORT rc=$? date; -if [[ $rc != 0 ]]; then +if [ $rc != 0 ]; then echo "[Error] Failed to initialize onboard schemas"; exit $rc; fi |