projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update osm bundles to cs:osm-64 and cs:osm-ha-49
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
530c20b
..
8215fd9
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-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/