X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile;fp=docker%2FDockerfile;h=b3b786066fa02a504f1a479cbda8c7905107cafc;hb=c596f2864585d86379e1c824f3f390d0642bdfe3;hp=a0740ff2d80fb8de9cdb865cd61eae6bca1cb43b;hpb=031002d24a4c209f44369da409c66ef4b9995fff;p=osm%2Ftests.git diff --git a/docker/Dockerfile b/docker/Dockerfile index a0740ff..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,9 +56,6 @@ 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