projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Dockerfiles to remove pyangbind patch
[osm/devops.git]
/
docker
/
tests
/
Dockerfile
diff --git
a/docker/tests/Dockerfile
b/docker/tests/Dockerfile
index
5eeda0d
..
34eda45
100644
(file)
--- a/
docker/tests/Dockerfile
+++ b/
docker/tests/Dockerfile
@@
-15,7
+15,7
@@
# limitations under the License.
#######################################################################################
# limitations under the License.
#######################################################################################
-FROM ubuntu:2
0
.04 as FINAL
+FROM ubuntu:2
2
.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@
-25,21
+25,23
@@
RUN if [ ! -z $APT_PROXY ] ; then \
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:9.3.* \
- python3=3.8.* \
- python3-dev=3.8.* \
- python3-pip=20.0.2* \
- python3-setuptools=45.2.* \
- curl=7.68.*
+ gcc=4:11.* \
+ python3=3.10.* \
+ python3-dev=3.10.* \
+ python3-pip=22.0.* \
+ curl=7.81.* \
+ && rm -rf /var/lib/apt/lists/*
+
+#######################################################################################
+# End of common preparation
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 \
- gettext-base=0.
19.
* \
- git=1:2.
25
.* \
+ gettext-base=0.
21
* \
+ git=1:2.
34
.* \
iputils-ping=3:* \
jq=1.6* \
iputils-ping=3:* \
jq=1.6* \
- libcurl4-openssl-dev=7.68.* \
- libssl-dev=1.1.*
+ libmagic1=1:5.*
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL