X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Dockerfile.local;h=a64bf4ce8c30abdb7cd6bd96f0788675d17c907c;hb=bd5ce7aab270c9faba89801c70dfc99f063a48c5;hp=cf182805120d49a9a33ccb7d59fa833596a86344;hpb=744303e157182880777f169259ea7cd4431af1d7;p=osm%2FLCM.git diff --git a/Dockerfile.local b/Dockerfile.local index cf18280..a64bf4c 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -29,8 +29,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 RUN apt-get update && apt-get install -y git tox python3 \ @@ -72,6 +72,7 @@ ENV OSMLCM_VCA_HOST vca ENV OSMLCM_VCA_PORT 17070 ENV OSMLCM_VCA_USER admin ENV OSMLCM_VCA_SECRET secret +ENV OSMLCM_VCA_CLOUD: localhost # ENV OSMLCM_VCA_ENABLEOSUPGRADE false # ENV OSMLCM_VCA_APTMIRROR http://archive.ubuntu.com/ubuntu/ # ENV OSMLCM_VCA_PUBKEY pubkey @@ -116,5 +117,6 @@ ADD . /app/LCM # Run app.py when the container launches CMD python3 -m osm_lcm.lcm -# HEALTHCHECK --interval=120s --timeout=15s --retries=1 \ -# CMD python3 -m osm_lcm.lcm --health-check || exit 1 +# HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \ +# CMD python3 -m osm_lcm.lcm_hc || exit 1 +