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 1633 - Pinning packages to major version
[osm/devops.git]
/
docker
/
osmclient
/
Dockerfile
diff --git
a/docker/osmclient/Dockerfile
b/docker/osmclient/Dockerfile
index
f5980ad
..
e07116f
100644
(file)
--- a/
docker/osmclient/Dockerfile
+++ b/
docker/osmclient/Dockerfile
@@
-19,17
+19,15
@@
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.13 && \
+ gcc=4:7.4.* \
+ python3=3.6.* \
+ python3-dev=3.6.* \
+ python3-setuptools=39.0.* \
+ curl=7.58.* \
+ libcurl4-openssl-dev=7.58.* \
+ libssl-dev=1.1.* && \
python3 -m easy_install pip==21.0.1
python3 -m easy_install pip==21.0.1
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \
- libssl-dev=1.1.1-1ubuntu2.1~18.04.9
-
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
@@
-46,7
+44,7
@@
RUN pip3 install \
FROM ubuntu:18.04 as FINAL
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
FROM ubuntu:18.04 as FINAL
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.
*
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