X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile;h=b3b786066fa02a504f1a479cbda8c7905107cafc;hb=d7fc3fc4f1eb06ab3219b77c94b87d9a4fb54ee1;hp=cc484bd85291edea1bbc7c1b2dd891cf756f1e3b;hpb=b70ccd6f95428c28aa3d756f07b91ee23a2637fd;p=osm%2Ftests.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cc484bd..b3b7860 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,18 +21,7 @@ FROM ubuntu:18.04
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \
     make python3 debhelper python3-pip apt-utils ssh iputils-ping libcurl4-openssl-dev libssl-dev cargo rustc
 
-# Installing Juju
-ARG JUJU_VERSION_M=2.8
-ARG JUJU_VERSION_R=11
-ARG JUJU_VERSION=$JUJU_VERSION_M.$JUJU_VERSION_R
-
-RUN curl --output /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -LO \
-    https://launchpad.net/juju/$JUJU_VERSION_M/$JUJU_VERSION/+download/juju-$JUJU_VERSION-linux-amd64.tar.xz && \
-    tar -xf /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -C /tmp && \
-    install /tmp/juju /usr/local/bin/juju && \
-    rm /tmp/juju /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz
-
-RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y 
+RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
 
 RUN python3 -m pip install -U pip
 
@@ -67,8 +56,8 @@ ENV ROBOT_REPORT_FOLDER=/robot-systest/reports
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config
 
-# Juju data folder
-ENV JUJU_DATA=/root/.local/share/juju
+# OSM RSA file
+ENV OSM_RSA_FILE=/root/osm_id_rsa
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8