From 3f16fd5d8a3f630630856484190bc35d7ea760b1 Mon Sep 17 00:00:00 2001 From: Adam Israel Date: Tue, 3 Dec 2019 10:14:06 -0500 Subject: [PATCH] Install Juju CLI in LCM container Installs the Juju/K8s CLI into the docker container with LCM Change-Id: I78a3be7df47eff96332c8e7f91ef1dcefbfd73b5 Signed-off-by: Adam Israel --- docker/LCM/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 8b2cee69..7a1f4a27 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -55,7 +55,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make # && cd modules/libjuju && python3 setup.py develop && cd ../.. \ # && python3 -m pip install -U -r requirements.txt -RUN apt-get update && apt-get install -y curl \ +RUN apt-get update && apt-get install -y curl xz-utils \ && apt-get update && apt-get install -y apt-transport-https \ && curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \ && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \ @@ -66,6 +66,10 @@ 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 -L https://launchpad.net/juju/2.7/2.7.0/+download/juju-2.7.0-k8s.tar.xz --output juju-2.7.0-k8s.tar.xz \ + && tar -xvf juju-2.7.0-k8s.tar.xz \ + && mv juju /usr/local/bin/juju + ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian ARG RELEASE=ReleaseFOUR-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg @@ -124,6 +128,7 @@ ENV OSMLCM_MESSAGE_PORT 9092 # k8s ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl +ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju # logs # ENV OSMLCM_GLOBAL_LOGFILE /app/log/lcm.log -- 2.17.1