projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1558 to add DEVOPS_PATH default value to install_osm.sh
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
530c20b
..
81524a9
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-36,8
+36,8
@@
RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add
&& echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
&& apt-get update && apt-get install -y kubectl=1.20.4-00
&& echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
&& apt-get update && apt-get install -y kubectl=1.20.4-00
-RUN curl https://get.helm.sh/helm-v2.1
5.2-linux-amd64.tar.gz --output helm-v2.15.2
.tar.gz \
- && tar -zxvf helm-v2.1
5.2
.tar.gz \
+RUN curl https://get.helm.sh/helm-v2.1
7.0-linux-amd64.tar.gz --output helm-v2.17.0
.tar.gz \
+ && tar -zxvf helm-v2.1
7.0
.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm \
&& rm -r linux-amd64/
&& mv linux-amd64/helm /usr/local/bin/helm \
&& rm -r linux-amd64/
@@
-46,10
+46,6
@@
RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4
&& mv linux-amd64/helm /usr/local/bin/helm3 \
&& rm -r linux-amd64/
&& mv linux-amd64/helm /usr/local/bin/helm3 \
&& rm -r linux-amd64/
-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 PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_LCM_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_LCM_URL
@@
-83,7
+79,7
@@
COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/pytho
COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
-COPY --from=INSTALL /usr/
local/bin/juju /usr/local/bin/juju
+COPY --from=INSTALL /usr/
bin/scp /usr/bin/scp
COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
COPY --from=INSTALL /usr/bin/ssh /usr/bin/ssh
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
COPY --from=INSTALL /usr/bin/ssh /usr/bin/ssh
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
@@
-131,6
+127,9
@@
ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
+# helm
+ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable
+
# logs
# ENV OSMLCM_GLOBAL_LOGFILE /app/log/lcm.log
# ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
# logs
# ENV OSMLCM_GLOBAL_LOGFILE /app/log/lcm.log
# ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG