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

ci: Fix few dockerfiles

Browse Source
This commit is contained in:
Mizux Seiha
2025-04-23 18:37:26 +02:00
parent cae6cd67a7
commit 1c5daab55d
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bazel/docker/fedora/Dockerfile
View File

@@ -20,7 +20,7 @@ https://github.com/bazelbuild/bazelisk/releases/download/v1.23.0/bazelisk-linux-
# 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

22
bazel/docker/ubuntu/Dockerfile
View File

@@ -7,21 +7,23 @@ ENV TZ=Europe/Paris
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Install system build dependencies
RUN apt-get update -qq \
&& apt-get install -yq git wget curl libssl-dev build-essential \
&& apt-get install -yq python3-dev python3-pip python3-venv \
RUN apt update -qq \
&& apt install -yq git wget curl libssl-dev build-essential \
&& apt install -yq python3-dev python3-pip python3-venv \
python3-numpy python3-pandas \
&& apt-get install -yq default-jdk \
&& apt-get clean \
&& apt install -yq default-jdk \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install Bazel
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
RUN apt install -y apt-transport-https curl gnupg \
&& curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg \
&& mv bazel-archive-keyring.gpg /usr/share/keyrings
ARG TARGETARCH=amd64
RUN echo "deb [arch=$TARGETARCH] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
RUN apt-get update -qq \
&& apt-get install -yq bazel \
&& apt-get clean \
RUN echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
RUN apt update -qq \
&& apt install -yq bazel \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
FROM env AS devel

2
cmake/docker/fedora/java.Dockerfile
View File

@@ -1,7 +1,7 @@
FROM ortools/cmake:fedora_swig AS env
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
cmake/docker/ubuntu/python.Dockerfile
View File

@@ -6,7 +6,7 @@ RUN apt-get update -qq \
python3-dev python3-pip \
python3-setuptools python3-wheel \
python3-venv python3-virtualenv \
python3-numpy python3-pandas \
python3-numpy python3-pandas python3-typing-extensions \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN python3 -m pip install --break-system-package \