tools/docker: update

google · Jul 25, 2023 · 6d4150e · 6d4150e
1 parent f046fb0
commit 6d4150e
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 222 deletions.
diff --git a/tools/docker/Makefile b/tools/docker/Makefile
@@ -91,7 +91,6 @@ help:
 	@echo -e "\t${BOLD}<distro>${RESET}:"
 	@echo -e "\t\t${BOLD}alpine-edge${RESET} (latest)"
 	@echo -e "\t\t${BOLD}archlinux${RESET} (latest)"
-	@echo -e "\t\t${BOLD}centos-8${RESET} (Centos Stream 8)"
 	@echo -e "\t\t${BOLD}centos-7${RESET} (Centos 7 LTS)"
 	@echo -e "\t\t${BOLD}debian-sid${RESET} (unstable)"
 	@echo -e "\t\t${BOLD}debian-11${RESET} (bullseye, latest)"
@@ -402,7 +401,7 @@ PLATFORMS := amd64 arm64 # riscv64
 DISTROS := \
  alpine-edge \
  archlinux \
- centos-7 centos-8 \
+ centos-7 \
  debian-10 debian-11 debian-sid \
  fedora-37 fedora-38 fedora-39 \
  opensuse-leap \

diff --git a/tools/docker/images/centos-8.Dockerfile b/tools/docker/images/centos-8.Dockerfile
diff --git a/tools/docker/images/debian-10.Dockerfile b/tools/docker/images/debian-10.Dockerfile
@@ -46,6 +46,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/debian-11.Dockerfile b/tools/docker/images/debian-11.Dockerfile
@@ -46,6 +46,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/debian-sid.Dockerfile b/tools/docker/images/debian-sid.Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/fedora-37.Dockerfile b/tools/docker/images/fedora-37.Dockerfile
@@ -36,6 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 RUN dnf -y update \
 && dnf -y install python3 python3-devel python3-pip \
 && dnf clean all
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ################
 ##  OR-TOOLS  ##

diff --git a/tools/docker/images/fedora-38.Dockerfile b/tools/docker/images/fedora-38.Dockerfile
@@ -36,6 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 RUN dnf -y update \
 && dnf -y install python3 python3-devel python3-pip \
 && dnf clean all
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ################
 ##  OR-TOOLS  ##

diff --git a/tools/docker/images/fedora-39.Dockerfile b/tools/docker/images/fedora-39.Dockerfile
@@ -36,6 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 RUN dnf -y update \
 && dnf -y install python3 python3-devel python3-pip \
 && dnf clean all
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ################
 ##  OR-TOOLS  ##

diff --git a/tools/docker/images/opensuse-leap.Dockerfile b/tools/docker/images/opensuse-leap.Dockerfile
@@ -59,7 +59,7 @@ RUN zypper install -y java-1_8_0-openjdk java-1_8_0-openjdk-devel maven \
 # Install Python
 RUN zypper install -y python3-devel python3-pip python3-wheel \
 && zypper clean -a
-#RUN python3 -m pip install absl-py mypy-protobuf
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ################
 ##  OR-TOOLS  ##

diff --git a/tools/docker/images/ubuntu-20.04.Dockerfile b/tools/docker/images/ubuntu-20.04.Dockerfile
@@ -51,6 +51,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/ubuntu-22.04.Dockerfile b/tools/docker/images/ubuntu-22.04.Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/ubuntu-22.10.Dockerfile b/tools/docker/images/ubuntu-22.10.Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/images/ubuntu-23.04.Dockerfile b/tools/docker/images/ubuntu-23.04.Dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update -qq \
 && apt-get install -qq python3 python3-dev python3-pip python3-venv \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN python3 -m pip install absl-py mypy-protobuf
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

diff --git a/tools/docker/test/centos-8/cpp.Dockerfile b/tools/docker/test/centos-8/cpp.Dockerfile
diff --git a/tools/docker/test/centos-8/dotnet.Dockerfile b/tools/docker/test/centos-8/dotnet.Dockerfile
diff --git a/tools/docker/test/centos-8/java.Dockerfile b/tools/docker/test/centos-8/java.Dockerfile
diff --git a/tools/docker/test/centos-8/python.Dockerfile b/tools/docker/test/centos-8/python.Dockerfile