projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1880 Speed up Artifactory search
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
6cb51a2
..
8669369
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-16,21
+16,21
@@
########################################################################
########################################################################
-FROM ubuntu:
18
.04 as INSTALL
+FROM ubuntu:
20
.04 as INSTALL
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- gcc=4:
7.4.0-1ubuntu2.3
\
- 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
+ gcc=4:
9.3.*
\
+ python3=3.
8.*
\
+ python3-dev=3.
8.*
\
+ python3-
pip=20.0.2*
\
+
python3-setuptools=45.2.*
\
+ curl=7.68.*
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- apt-transport-https=
1.6.12ubuntu0.2
\
- gnupg2=2.2.
4-1ubuntu1.4
\
- openssh-client
+ apt-transport-https=
2.0.*
\
+ gnupg2=2.2.
*
\
+ openssh-client
=1: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 \
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 \
@@
-65,15
+65,27
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt \
-r /usr/lib/python3/dist-packages/n2vc/requirements.txt
-r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt \
-r /usr/lib/python3/dist-packages/n2vc/requirements.txt
-FROM ubuntu:18.04
+#######################################################################################
+FROM ubuntu:20.04 as FINAL
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+ echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+ echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+ fi
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ python3-minimal=3.8.* \
+ && rm -rf /var/lib/apt/lists/*
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install ca-certificates
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ ca-certificates \
+ && rm -rf /var/lib/apt/lists/*
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/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
+COPY --from=INSTALL /usr/local/lib/python3.
8/dist-packages /usr/local/lib/python3.8
/dist-packages
COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm