X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=d9da408b02b53560142f0004044ad823e17da5ff;hb=refs%2Fchanges%2F88%2F9188%2F1;hp=e7a86cb8a9081dad90c2d27f2bafc97841a6bc35;hpb=c196383e0bd5d6cf2d703822f488e4b107ee83a6;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index e7a86cb8..d9da408b 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -65,8 +65,8 @@ 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 @@ -107,9 +107,13 @@ ENV OSMLCM_RO_TENANT osm # VCA ENV OSMLCM_VCA_HOST vca -ENV OSMLCM_VCA_PORT: 17070 -ENV OSMLCM_VCA_USER: admin -ENV OSMLCM_VCA_SECRET: secret +ENV OSMLCM_VCA_PORT 17070 +ENV OSMLCM_VCA_USER admin +ENV OSMLCM_VCA_SECRET secret +# ENV OSMLCM_VCA_PUBKEY pubkey +# ENV OSMLCM_VCA_CACERT cacert +# ENV OSMLCM_VCA_ENABLEOSUPGRADE false +# ENV OSMLCM_VCA_APTMIRROR http://archive.ubuntu.com/ubuntu/ # database ENV OSMLCM_DATABASE_DRIVER mongo @@ -136,7 +140,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