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
/
POL
/
Dockerfile
diff --git
a/docker/POL/Dockerfile
b/docker/POL/Dockerfile
index
c50cd10
..
d87e845
100644
(file)
--- a/
docker/POL/Dockerfile
+++ b/
docker/POL/Dockerfile
@@
-24,16
+24,14
@@
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.5 \
- gcc=4:9.3.0-1ubuntu2 \
- python3=3.8.2-0ubuntu2 \
- python3-setuptools=45.2.0-1 \
- python3-dev=3.8.2-0ubuntu2 && \
+ curl=7.68.* \
+ gcc=4:9.3.* \
+ python3=3.8.* \
+ python3-setuptools=45.2.* \
+ python3-dev=3.8.* \
+ mysql-client-core-8.0=8.0.* && \
python3 -m easy_install pip==21.0.1
python3 -m easy_install pip==21.0.1
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- mysql-client-core-8.0=8.0.23-0ubuntu0.20.04.1
-
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_POLICY_MODULE_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_POLICY_MODULE_URL
@@
-50,12
+48,16
@@
RUN pip3 install \
FROM ubuntu:20.04 as FINAL
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
FROM ubuntu:20.04 as FINAL
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.
*
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/bin/osm* /usr/bin/
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/bin/osm* /usr/bin/
+COPY --from=INSTALL /usr/bin/mysql /usr/bin/
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
+COPY --from=INSTALL /usr/bin/mysqlshow /usr/bin/
+COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libedit.so.2 /usr/lib/x86_64-linux-gnu/
+COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/
COPY scripts/ scripts/
COPY scripts/ scripts/