always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/docker: replace ubuntu 22.10 by ubuntu 23.10

Browse Source
This commit is contained in:
Corentin Le Molgat
2023-10-27 08:06:45 +02:00
parent 3b00b323ba
commit 4a28412e6c
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/docker/Makefile
View File

@@ -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

2
tools/docker/images/ubuntu-23.04.Dockerfile
View File

@@ -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

9
tools/docker/images/ubuntu-22.10.Dockerfile → tools/docker/images/ubuntu-23.10.Dockerfile
View File

@@ -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

2
tools/docker/test/ubuntu-23.04/dotnet.Dockerfile
View File

@@ -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 \

4
tools/docker/test/ubuntu-22.10/cpp.Dockerfile → tools/docker/test/ubuntu-23.10/cpp.Dockerfile
View File

@@ -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

6
tools/docker/test/ubuntu-22.10/dotnet.Dockerfile → tools/docker/test/ubuntu-23.10/dotnet.Dockerfile
View File

@@ -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

4
tools/docker/test/ubuntu-22.10/java.Dockerfile → tools/docker/test/ubuntu-23.10/java.Dockerfile
View File

@@ -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

4
tools/docker/test/ubuntu-22.10/python.Dockerfile → tools/docker/test/ubuntu-23.10/python.Dockerfile
View File

@@ -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