projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1879 Speed up Artifactory search
[osm/devops.git]
/
docker
/
MON
/
Dockerfile
diff --git
a/docker/MON/Dockerfile
b/docker/MON/Dockerfile
index
f572748
..
0046df8
100644
(file)
--- a/
docker/MON/Dockerfile
+++ b/
docker/MON/Dockerfile
@@
-24,13
+24,15
@@
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 \
- curl=7.68.0-1ubuntu2.6 \
- gcc=4:9.3.0-1ubuntu2 \
- python3=3.8.2-0ubuntu2 \
- python3-setuptools=45.2.0-1 \
- python3-dev=3.8.2-0ubuntu2 \
- openssh-client=1:8.2p1-4ubuntu0.2 && \
- 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 \
+ openssh-client=1:8.*
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_MON_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_MON_URL
@@
-50,13
+52,24
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
-r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
+#######################################################################################
FROM ubuntu:20.04 as FINAL
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.8.2-0ubuntu2
+ 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/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages