commit df353be353e1ec25ac2a0e64a9eb617dcbc87703
author sebdet <sebastien.determe@intl.att.com> Mon Sep 21 22:13:05 2020 +0200
committer Michael Morris <michael.morris@est.tech> Wed May 12 10:27:10 2021 +0000
tree e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a
parent 936781153118364e60662529dbd7217416a26148

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>

asdctool/sdc-cassandra-init/Dockerfile

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index e35f841..e532100 100644
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -16,7 +16,6 @@
     echo  '[cql]' > ~/.cassandra/cqlshrc  && \
     echo  'version=3.4.4' >> ~/.cassandra/cqlshrc  && \
     set -ex && \
-    pip install cqlsh && \
     apt-get install -y \
     make \
     gcc \
@@ -25,14 +24,12 @@
     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 chef-solo /home/sdc/chef-solo/
-
 COPY --chown=sdc:sdc chef-repo/cookbooks /home/sdc/chef-solo/cookbooks/
-
 COPY --chown=sdc:sdc startup.sh /home/sdc/
 
 RUN chmod 770 /home/sdc/startup.sh