Added helm3 installation to LCM docker

[osm/devops.git] / docker / LCM / Dockerfile

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 0a2344e..20ac54b 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -40,14 +40,12 @@ APT::AutoRemove::SuggestsImportant "false";\n'\
 RUN apt-get update && apt-get -y install curl software-properties-common
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make python3 \
-    gpg-agent python3-pip python3-pymongo python3-aiohttp \
+    gpg-agent python3-pip  \
     python3-all python3-setuptools openssh-client libffi-dev libssl-dev \
-    python3-bitarray python3-regex python3-lxml dh-python wget tox \
-    python3-cffi \
+    wget tox python3-cffi \
     && python3 -m pip install -U pip \
-    && python3 -m pip install -U aiokafka lxml six enum34 \
-    && python3 -m pip install requests \
-    && python3 -m pip install -U juju==2.8.2 \
+    && python3 -m pip install -U juju==2.8.4 \
+    && python3 -m pip install -U kubernetes==10.0.1 \
     && rm -rf /var/lib/apt/lists/*
 
 # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
@@ -65,6 +63,11 @@ RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15
     && mv linux-amd64/helm /usr/local/bin/helm \
     && rm -r linux-amd64/
 
+RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4.tar.gz \
+    && tar -zxvf helm-v3.3.4.tar.gz \
+    && mv linux-amd64/helm /usr/local/bin/helm3 \
+    && rm -r linux-amd64/
+
 RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz --output juju-2.7.6-k8s.tar.xz \
     && tar -xvf juju-2.7.6-k8s.tar.xz \
     && mv juju /usr/local/bin/juju
@@ -79,8 +82,6 @@ RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} LCM N
 
 RUN python3 -m pip install -U "cffi==1.13.2"
 
-RUN python3 -m pip install grpcio-tools grpclib
-
 ARG LCM_VERSION
 ARG COMMON_VERSION
 ARG N2VC_VERSION