projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add web ui authentication
[osm/devops.git]
/
docker
/
RO
/
Dockerfile
diff --git
a/docker/RO/Dockerfile
b/docker/RO/Dockerfile
index
fbb191a
..
04f7c4c
100644
(file)
--- a/
docker/RO/Dockerfile
+++ b/
docker/RO/Dockerfile
@@
-20,14
+20,14
@@
FROM ubuntu:18.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.14
\
- genisoimage=9:1.1.
11-3ubuntu2
\
- netbase=5.
4
&& \
- python3 -m easy_install pip==21.0.1
+ gcc=4:7.4.
*
\
+ python3=3.6.
*
\
+ python3-dev=3.6.
*
\
+ python3-setuptools=39.0.
*
\
+ curl=7.58.
*
\
+ genisoimage=9:1.1.
*
\
+ netbase=5.
*
&& \
+ python3 -m easy_install pip==21.0.1
setuptools==51.0.0
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_NG_RO_URL
@@
-81,7
+81,8
@@
RUN pip3 install \
FROM ubuntu:18.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
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
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \
+ && 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.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