projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for Bug 1627: Build failed due to upstream dependency not found
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
8215fd9
..
711bfd1
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-24,13
+24,11
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
python3=3.6.7-1~18.04 \
python3-dev=3.6.7-1~18.04 \
python3-setuptools=39.0.1-2 \
python3=3.6.7-1~18.04 \
python3-dev=3.6.7-1~18.04 \
python3-setuptools=39.0.1-2 \
- curl=7.58.0-2ubuntu3.13 && \
- python3 -m easy_install pip==21.0.1
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ curl=7.58.0-2ubuntu3.14 \
apt-transport-https=1.6.12ubuntu0.2 \
gnupg2=2.2.4-1ubuntu1.4 \
apt-transport-https=1.6.12ubuntu0.2 \
gnupg2=2.2.4-1ubuntu1.4 \
- openssh-client
+ openssh-client && \
+ python3 -m easy_install pip==21.0.1
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 \
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 \
@@
-70,8
+68,7
@@
FROM ubuntu:18.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- ca-certificates
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install ca-certificates
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages
@@
-85,6
+82,8
@@
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 /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
+COPY scripts/ scripts/
+
########################################################################
# Used for local storage
########################################################################
# Used for local storage
@@
-127,6
+126,10
@@
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
+# ENV OSMLCM_VCA_HELM_CA_CERTS <ca-cert>
+
# 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
@@
-136,5
+139,5
@@
HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
# Run app.py when the container launches
# Run app.py when the container launches
-CMD
python3 -m osm_lcm.lcm
+CMD
[ "/bin/bash", "scripts/start.sh" ]