Upgrade docker images to use Python 3

[sdc.git] / asdctool / sdc-cassandra-init / Dockerfile

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index 33d8738..82ac337 100644 (file)
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -1,8 +1,6 @@
-FROM onap/policy-jdk-debian:2.0.1
+FROM onap/policy-jdk-debian:2.0.2
 
-#RUN addgroup --gid 1000 sdc
 RUN addgroup sdc
-#RUN adduser --gecos "sdc sdc,1,1,1" -u 1000 --disabled-password --ingroup sdc --shell /bin/sh sdc
 RUN adduser --gecos "sdc sdc,1,1,1" --disabled-password --ingroup sdc --shell /bin/sh sdc
 USER sdc
 RUN mkdir ~/.cassandra/ && \
@@ -10,8 +8,11 @@ RUN mkdir ~/.cassandra/ && \
     echo  'version=3.4.4' >> ~/.cassandra/cqlshrc
 USER root
 
-RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip && \
-    pip install cqlsh && \
+RUN apt-get update --allow-releaseinfo-change &&  \
+    apt-get purge python* -y && \
+    apt-get install -y python3-pip && \
+    python3 -m pip install --upgrade pip && \
+    pip3 install cqlsh==6.1.0 && \
     mkdir ~/.cassandra/ && \
     echo  '[cql]' > ~/.cassandra/cqlshrc  && \
     echo  'version=3.4.4' >> ~/.cassandra/cqlshrc  && \
@@ -23,7 +24,11 @@ RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip &
     ruby-dev \
     libffi-dev \
     libxml2-dev && \
-    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \
+    gem install public_suffix -v 4.0.7 --no-document && \
+    gem install multipart-post -v 2.2.0 --no-document && \
+    gem install etc -v 1.3.0 --no-document && \
+    gem install bundler -v 2.3.26 --no-document && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 webrick --no-document && \
     apt-get update -y && apt-get remove bash -y --allow-remove-essential && \
     apt-get install -y binutils && apt-get clean && gem cleanup
 
@@ -35,4 +40,3 @@ COPY --chown=sdc:sdc startup.sh /home/sdc/
 RUN chmod 770 /home/sdc/startup.sh
 
 ENTRYPOINT [ "/home/sdc/startup.sh" ]
-