projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1706 - Adding non-root user to run MON
[osm/devops.git]
/
docker
/
PLA
/
Dockerfile
diff --git
a/docker/PLA/Dockerfile
b/docker/PLA/Dockerfile
index
953678d
..
8d4350b
100644
(file)
--- a/
docker/PLA/Dockerfile
+++ b/
docker/PLA/Dockerfile
@@
-17,12
+17,12
@@
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
&& \
- 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.
*
&& \
+ python3 -m easy_install pip==21.0.1
setuptools==51.0.0
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_PLA_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_PLA_URL
@@
-46,7
+46,8
@@
FROM ubuntu:18.04
LABEL authors="Lars-Göran Magnusson"
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
LABEL authors="Lars-Göran Magnusson"
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