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

tools/docker: fix images

Browse Source
This commit is contained in:
Corentin Le Molgat
2025-06-03 17:25:06 +02:00
parent 6275619174
commit 888479c8f1
14 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker/Makefile
View File

@@ -93,7 +93,7 @@ help:
@echo -e "\t\t${BOLD}alpine-edge${RESET} (latest)"
@echo -e "\t\t${BOLD}archlinux${RESET} (latest)"
@echo -e "\t\t${BOLD}debian-sid${RESET} (unstable)"
# @echo -e "\t\t${BOLD}debian-13${RESET} (Trixie)"
#@echo -e "\t\t${BOLD}debian-13${RESET} (Trixie)"
@echo -e "\t\t${BOLD}debian-12${RESET} (Bookworm)"
@echo -e "\t\t${BOLD}debian-11${RESET} (Bullseye)"
@echo -e "\t\t${BOLD}fedora-42${RESET}"

14
tools/docker/images/debian-13.Dockerfile
View File

@@ -4,10 +4,10 @@ FROM debian:13 AS env
#############
## SETUP ##
#############
RUN apt-get update -qq \
&& apt-get install -qq \
git pkg-config wget cmake make autoconf libtool zlib1g-dev gawk g++ curl subversion \
swig lsb-release \
RUN apt update -qq \
&& apt install -yq \
git pkg-config wget cmake build-essential zlib1g-dev \
swig lsb-release libicu-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENTRYPOINT ["/bin/bash", "-c"]
@@ -30,10 +30,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 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

27
tools/docker/images/debian-sid.Dockerfile
View File

@@ -5,29 +5,19 @@ FROM debian:sid AS env
## SETUP ##
#############
RUN apt update -qq \
&& apt install -yq git wget build-essential cmake lsb-release zlib1g-dev \
&& apt install -yq \
git pkg-config wget cmake build-essential zlib1g-dev \
swig libicu-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENTRYPOINT ["/bin/bash", "-c"]
CMD ["/bin/bash"]
# Install SWIG
RUN apt update -qq \
&& apt install -yq swig \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install .Net
# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-13-
RUN apt-get update -qq \
&& apt-get install -qq gpg apt-transport-https \
&& wget -q "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update -qq \
&& apt-get install -qq dotnet-sdk-8.0 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
&& chmod a+x dotnet-install.sh \
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info
@@ -44,7 +34,8 @@ RUN apt-get update -qq \
python3-venv python3-virtualenv \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN python3 -m pip install --break-system-package absl-py mypy 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/images/fedora-41.Dockerfile
View File

@@ -6,7 +6,7 @@ FROM fedora:41 AS env
#############
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

4
tools/docker/images/fedora-42.Dockerfile
View File

@@ -6,7 +6,7 @@ FROM fedora:42 AS env
#############
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all
@@ -30,7 +30,7 @@ RUN dotnet --info
# Install Java
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

13
tools/docker/images/ubuntu-22.04.Dockerfile
View File

@@ -8,11 +8,18 @@ FROM ubuntu:22.04 AS env
#############
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update -qq \
&& apt install -yq git wget build-essential cmake lsb-release zlib1g-dev \
&& apt install -yq git wget build-essential lsb-release zlib1g-dev \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENTRYPOINT ["/usr/bin/bash", "-c"]
CMD ["/usr/bin/bash"]
ENTRYPOINT ["/bin/bash", "-c"]
CMD ["/bin/bash"]
# Install CMake 3.31.0
RUN ARCH=$(uname -m) \
&& wget -q "https://cmake.org/files/v3.31/cmake-3.31.0-linux-${ARCH}.sh" \
&& chmod a+x cmake-3.31.0-linux-${ARCH}.sh \
&& ./cmake-3.31.0-linux-${ARCH}.sh --prefix=/usr/local/ --skip-license \
&& rm cmake-3.31.0-linux-${ARCH}.sh
# Install SWIG
RUN apt-get update -qq \

2
tools/docker/test/fedora-41/cpp.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:41
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

2
tools/docker/test/fedora-41/dotnet.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:41
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

2
tools/docker/test/fedora-41/java.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:41
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

2
tools/docker/test/fedora-41/python.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:41
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

2
tools/docker/test/fedora-42/cpp.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:42
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

2
tools/docker/test/fedora-42/dotnet.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:42
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all

4
tools/docker/test/fedora-42/java.Dockerfile
View File

@@ -3,14 +3,14 @@ FROM fedora:42
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all
# Java Install
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

2
tools/docker/test/fedora-42/python.Dockerfile
View File

@@ -3,7 +3,7 @@ FROM fedora:42
RUN dnf -y update \
&& dnf -y install git \
wget which redhat-lsb-core pkgconfig autoconf libtool zlib-devel \
wget which lsb_release pkgconfig autoconf libtool zlib-devel \
&& dnf -y install @development-tools \
&& dnf -y install gcc-c++ cmake \
&& dnf clean all