X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=docker%2FLCM%2FDockerfile;h=0a2344e36bcfcbbd80379ec0391de7cc2e6f8c35;hb=84e74693b05dbff800c8e0a8c5e5237732d114c5;hp=5ee783f3f786abc606dd7b3406e4a646e86f8011;hpb=a2e418487ee61db3b153aa928e0264b8c6ff8a40;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 5ee783f3..0a2344e3 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make && 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 \ + && python3 -m pip install -U juju==2.8.2 \ && rm -rf /var/lib/apt/lists/* # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \ @@ -65,12 +65,12 @@ 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 \ +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 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing @@ -79,16 +79,17 @@ 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 -RUN apt-get update && apt-get install -y python3-osm-lcm${LCM_VERSION} \ - python3-osm-common${COMMON_VERSION} \ - python3-n2vc${N2VC_VERSION} \ - && rm -rf /var/lib/apt/lists/* - -EXPOSE 9999 +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + python3-osm-lcm${LCM_VERSION} \ + python3-osm-common${COMMON_VERSION} \ + python3-n2vc${N2VC_VERSION} \ + && rm -rf /var/lib/apt/lists/* LABEL Maintainer="alfonso.tiernosepulveda@telefonica.com" \ Description="This implements life cycle management engine for OSM" \ @@ -140,7 +141,7 @@ ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju # ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \ - CMD python3 -m osm_lcm.lcm --health-check || exit 1 + CMD python3 -m osm_lcm.lcm_hc || exit 1 # Run app.py when the container launches