Skip to content

Commit 1c5daab

Browse files
committed
ci: Fix few dockerfiles
1 parent cae6cd6 commit 1c5daab

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

bazel/docker/fedora/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ https://github.com/bazelbuild/bazelisk/releases/download/v1.23.0/bazelisk-linux-
2020

2121
# Install Java
2222
RUN dnf -y update \
23-
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
23+
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
2424
&& dnf clean all
2525
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
2626

bazel/docker/ubuntu/Dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@ ENV TZ=Europe/Paris
77
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
88

99
# Install system build dependencies
10-
RUN apt-get update -qq \
11-
&& apt-get install -yq git wget curl libssl-dev build-essential \
12-
&& apt-get install -yq python3-dev python3-pip python3-venv \
10+
RUN apt update -qq \
11+
&& apt install -yq git wget curl libssl-dev build-essential \
12+
&& apt install -yq python3-dev python3-pip python3-venv \
1313
python3-numpy python3-pandas \
14-
&& apt-get install -yq default-jdk \
15-
&& apt-get clean \
14+
&& apt install -yq default-jdk \
15+
&& apt clean \
1616
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1717

1818
# Install Bazel
19-
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
19+
RUN apt install -y apt-transport-https curl gnupg \
20+
&& curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg \
21+
&& mv bazel-archive-keyring.gpg /usr/share/keyrings
2022
ARG TARGETARCH=amd64
21-
RUN echo "deb [arch=$TARGETARCH] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
22-
RUN apt-get update -qq \
23-
&& apt-get install -yq bazel \
24-
&& apt-get clean \
23+
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
24+
RUN apt update -qq \
25+
&& apt install -yq bazel \
26+
&& apt clean \
2527
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2628

2729
FROM env AS devel

cmake/docker/fedora/java.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ortools/cmake:fedora_swig AS env
22

33
RUN dnf -y update \
4-
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
4+
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
55
&& dnf clean all
66
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
77

cmake/docker/ubuntu/python.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update -qq \
66
python3-dev python3-pip \
77
python3-setuptools python3-wheel \
88
python3-venv python3-virtualenv \
9-
python3-numpy python3-pandas \
9+
python3-numpy python3-pandas python3-typing-extensions \
1010
&& apt-get clean \
1111
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1212
RUN python3 -m pip install --break-system-package \

0 commit comments

Comments
 (0)