diff --git a/tools/docker/Makefile b/tools/docker/Makefile index 7831c9c931..dfde496a29 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -99,8 +99,8 @@ help: @echo -e "\t\t${BOLD}fedora-38${RESET}" @echo -e "\t\t${BOLD}fedora-37${RESET}" # @echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)" - @echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04, rolling)" - @echo -e "\t\t${BOLD}ubuntu-22.10${RESET} (Ubuntu 22.10)" + @echo -e "\t\t${BOLD}ubuntu-23.10${RESET} (Ubuntu 23.10, rolling)" + @echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04)" @echo -e "\t\t${BOLD}ubuntu-22.04${RESET} (Ubuntu 22.04 LTS, latest)" @echo -e "\t\t${BOLD}ubuntu-20.04${RESET} (Ubuntu 20.04 LTS)" @echo @@ -406,7 +406,7 @@ DISTROS := \ centos-7 \ debian-11 debian-sid \ fedora-37 fedora-38 \ - ubuntu-20.04 ubuntu-22.04 ubuntu-22.10 ubuntu-23.04 + ubuntu-20.04 ubuntu-22.04 ubuntu-23.04 ubuntu-23.10 # List of stages STAGES := env devel diff --git a/tools/docker/images/ubuntu-23.04.Dockerfile b/tools/docker/images/ubuntu-23.04.Dockerfile index 6ec031fd7b..1ade472951 100644 --- a/tools/docker/images/ubuntu-23.04.Dockerfile +++ b/tools/docker/images/ubuntu-23.04.Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update -qq \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN python3 -m pip install --break-system-package \ - absl-py mypy-protobuf + absl-py mypy 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-23.10.Dockerfile similarity index 93% rename from tools/docker/images/ubuntu-22.10.Dockerfile rename to tools/docker/images/ubuntu-23.10.Dockerfile index 711a735eeb..7de8f45946 100644 --- a/tools/docker/images/ubuntu-22.10.Dockerfile +++ b/tools/docker/images/ubuntu-23.10.Dockerfile @@ -1,7 +1,6 @@ # Create a virtual environment with all tools installed -# Latest release aka 22.10 # ref: https://hub.docker.com/_/ubuntu -FROM ubuntu:22.10 AS env +FROM ubuntu:23.10 AS env ############# ## SETUP ## @@ -39,10 +38,12 @@ ENV JAVA_HOME=/usr/lib/jvm/default-java # Install Python RUN apt-get update -qq \ -&& apt-get install -qq python3 python3-dev python3-pip python3-venv \ +&& apt-get install -qq python3 python3-dev python3-pip \ + python3-venv python3-virtualenv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install --break-system-package \ + absl-py mypy 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/ubuntu-23.04/dotnet.Dockerfile b/tools/docker/test/ubuntu-23.04/dotnet.Dockerfile index 317f212cb2..291f652cee 100644 --- a/tools/docker/test/ubuntu-23.04/dotnet.Dockerfile +++ b/tools/docker/test/ubuntu-23.04/dotnet.Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install .Net -# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu#2110- +# see https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-2304 RUN apt-get update -qq \ && apt-get install -yq dotnet-sdk-6.0 \ && apt-get clean \ diff --git a/tools/docker/test/ubuntu-22.10/cpp.Dockerfile b/tools/docker/test/ubuntu-23.10/cpp.Dockerfile similarity index 80% rename from tools/docker/test/ubuntu-22.10/cpp.Dockerfile rename to tools/docker/test/ubuntu-23.10/cpp.Dockerfile index 539fa1fd6a..3a9b1683b2 100644 --- a/tools/docker/test/ubuntu-22.10/cpp.Dockerfile +++ b/tools/docker/test/ubuntu-23.10/cpp.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/ubuntu -FROM ubuntu:22.10 +FROM ubuntu:23.10 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq \ @@ -8,6 +8,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* WORKDIR /root -ADD or-tools_amd64_ubuntu-22.10_cpp_v*.tar.gz . +ADD or-tools_amd64_ubuntu-23.10_cpp_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/ubuntu-22.10/dotnet.Dockerfile b/tools/docker/test/ubuntu-23.10/dotnet.Dockerfile similarity index 80% rename from tools/docker/test/ubuntu-22.10/dotnet.Dockerfile rename to tools/docker/test/ubuntu-23.10/dotnet.Dockerfile index 15449bacc7..b97e20faa7 100644 --- a/tools/docker/test/ubuntu-22.10/dotnet.Dockerfile +++ b/tools/docker/test/ubuntu-23.10/dotnet.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/ubuntu -FROM ubuntu:22.10 +FROM ubuntu:23.10 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq \ @@ -8,7 +8,7 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install .Net -# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu#2110- +# see https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-2304 RUN apt-get update -qq \ && apt-get install -yq dotnet-sdk-6.0 \ && apt-get clean \ @@ -20,6 +20,6 @@ RUN dotnet --info #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone WORKDIR /root -ADD or-tools_amd64_ubuntu-22.10_dotnet_v*.tar.gz . +ADD or-tools_amd64_ubuntu-23.10_dotnet_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/ubuntu-22.10/java.Dockerfile b/tools/docker/test/ubuntu-23.10/java.Dockerfile similarity index 88% rename from tools/docker/test/ubuntu-22.10/java.Dockerfile rename to tools/docker/test/ubuntu-23.10/java.Dockerfile index 9f5de4e1aa..88ed3e4419 100644 --- a/tools/docker/test/ubuntu-22.10/java.Dockerfile +++ b/tools/docker/test/ubuntu-23.10/java.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/ubuntu -FROM ubuntu:22.10 +FROM ubuntu:23.10 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq \ @@ -16,6 +16,6 @@ RUN apt-get update -qq \ ENV JAVA_HOME=/usr/lib/jvm/default-java WORKDIR /root -ADD or-tools_amd64_ubuntu-22.10_java_v*.tar.gz . +ADD or-tools_amd64_ubuntu-23.10_java_v*.tar.gz . RUN cd or-tools_*_v* && make test diff --git a/tools/docker/test/ubuntu-22.10/python.Dockerfile b/tools/docker/test/ubuntu-23.10/python.Dockerfile similarity index 78% rename from tools/docker/test/ubuntu-22.10/python.Dockerfile rename to tools/docker/test/ubuntu-23.10/python.Dockerfile index 50be336821..60bee8a4c1 100644 --- a/tools/docker/test/ubuntu-22.10/python.Dockerfile +++ b/tools/docker/test/ubuntu-23.10/python.Dockerfile @@ -1,5 +1,5 @@ # ref: https://hub.docker.com/_/ubuntu -FROM ubuntu:22.10 +FROM ubuntu:23.10 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq \ @@ -8,6 +8,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* WORKDIR /root -ADD or-tools_amd64_ubuntu-22.10_python_v*.tar.gz . +ADD or-tools_amd64_ubuntu-23.10_python_v*.tar.gz . RUN cd or-tools_*_v* && make test