Skip to content

Commit 49c107d

Browse files
committed
distro: migrate to rockylinux 10
note: rockylinux:9 use python 3.9, while rockylinux:10 use Python 3.12 note: or-tools main do not support python 3.9 (EOL).
1 parent 7b5a1b5 commit 49c107d

File tree

8 files changed

+15
-18
lines changed

8 files changed

+15
-18
lines changed

bazel/docker/rockylinux/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
# Create a virtual environment with all tools installed
22
# ref: https://hub.docker.com/rockylinux/rockylinux
3-
FROM rockylinux/rockylinux:9 AS env
3+
FROM rockylinux/rockylinux:10 AS env
44

55
# Install system build dependencies
66
ENV PATH=/usr/local/bin:$PATH
77
RUN dnf -y update \
8-
&& dnf -y install git wget zlib-devel gcc-toolset-13 \
8+
&& dnf -y install git wget zlib-devel \
99
&& dnf -y group install "Development Tools" \
1010
&& dnf clean all \
1111
&& rm -rf /var/cache/dnf
1212

13-
RUN echo "source /opt/rh/gcc-toolset-13/enable" >> /etc/bashrc
14-
SHELL ["/bin/bash", "--login", "-c"]
15-
1613
# Install Bazelisk
1714
ARG TARGETARCH=amd64
1815
RUN wget \

cmake/docker/rockylinux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Create a virtual environment with all tools installed
22
# ref: https://hub.docker.com/rockylinux/rockylinux
3-
FROM rockylinux/rockylinux:9 AS base
3+
FROM rockylinux/rockylinux:10 AS base
44

55
# Install system build dependencies
66
ENV PATH=/usr/local/bin:$PATH

tools/docker/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ help:
100100
@echo -e "\t\t${BOLD}fedora-41${RESET}"
101101
@echo -e "\t\t${BOLD}fedora-40${RESET}"
102102
@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
103-
@echo -e "\t\t${BOLD}rockylinux-9${RESET} (latest)"
103+
@echo -e "\t\t${BOLD}rockylinux-10${RESET} (latest)"
104104
@echo -e "\t\t${BOLD}ubuntu-24.10${RESET} (Ubuntu 24.10, rolling)"
105105
@echo -e "\t\t${BOLD}ubuntu-24.04${RESET} (Ubuntu 24.04 LTS, latest)"
106106
@echo -e "\t\t${BOLD}ubuntu-22.04${RESET} (Ubuntu 22.04 LTS)"
@@ -434,7 +434,7 @@ DISTROS := \
434434
debian-11 debian-12 debian-sid \
435435
fedora-40 fedora-41 fedora-42 \
436436
opensuse-leap \
437-
rockylinux-9 \
437+
rockylinux-10 \
438438
ubuntu-20.04 ubuntu-22.04 ubuntu-24.04 ubuntu-24.10
439439

440440
# List of stages

tools/docker/images/rockylinux-9.Dockerfile renamed to tools/docker/images/rockylinux-10.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ref: https://hub.docker.com/rockylinux/rockylinux
2-
FROM rockylinux/rockylinux:9 AS env
2+
FROM rockylinux/rockylinux:10 AS env
33

44
#############
55
## SETUP ##
@@ -54,7 +54,7 @@ RUN python3 -m pip install \
5454
## OR-TOOLS ##
5555
################
5656
FROM env AS devel
57-
ENV DISTRIBUTION=rockylinux-9
57+
ENV DISTRIBUTION=rockylinux-10
5858

5959
WORKDIR /root
6060
# Copy the snk key

tools/docker/test/rockylinux-9/cpp.Dockerfile renamed to tools/docker/test/rockylinux-10/cpp.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ref: https://hub.docker.com/rockylinux/rockylinux
2-
FROM rockylinux/rockylinux:9
2+
FROM rockylinux/rockylinux:10
33

44
#############
55
## SETUP ##
@@ -13,6 +13,6 @@ RUN dnf -y update \
1313
#CMD ["/usr/bin/bash"]
1414

1515
WORKDIR /root
16-
ADD or-tools_amd64_rockylinux-9_cpp_v*.tar.gz .
16+
ADD or-tools_amd64_rockylinux-10_cpp_v*.tar.gz .
1717

1818
RUN cd or-tools_*_v* && make test

tools/docker/test/rockylinux-9/dotnet.Dockerfile renamed to tools/docker/test/rockylinux-10/dotnet.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ref: https://hub.docker.com/rockylinux/rockylinux
2-
FROM rockylinux/rockylinux:9
2+
FROM rockylinux/rockylinux:10
33

44
#############
55
## SETUP ##
@@ -20,6 +20,6 @@ RUN dnf -y update \
2020
RUN dotnet --info
2121

2222
WORKDIR /root
23-
ADD or-tools_amd64_rockylinux-9_dotnet_v*.tar.gz .
23+
ADD or-tools_amd64_rockylinux-10_dotnet_v*.tar.gz .
2424

2525
RUN cd or-tools_*_v* && make test

tools/docker/test/rockylinux-9/java.Dockerfile renamed to tools/docker/test/rockylinux-10/java.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ref: https://hub.docker.com/rockylinux/rockylinux
2-
FROM rockylinux/rockylinux:9
2+
FROM rockylinux/rockylinux:10
33

44
#############
55
## SETUP ##
@@ -19,6 +19,6 @@ RUN dnf -y update \
1919
#ENV JAVA_HOME=/usr/lib/jvm/java
2020

2121
WORKDIR /root
22-
ADD or-tools_amd64_rockylinux-9_java_v*.tar.gz .
22+
ADD or-tools_amd64_rockylinux-10_java_v*.tar.gz .
2323

2424
RUN cd or-tools_*_v* && make test

tools/docker/test/rockylinux-9/python.Dockerfile renamed to tools/docker/test/rockylinux-10/python.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ref: https://hub.docker.com/rockylinux/rockylinux
2-
FROM rockylinux/rockylinux:9
2+
FROM rockylinux/rockylinux:10
33

44
#############
55
## SETUP ##
@@ -20,6 +20,6 @@ RUN python3 -m pip install \
2020
absl-py mypy mypy-protobuf pandas
2121

2222
WORKDIR /root
23-
ADD or-tools_amd64_rockylinux-9_python_v*.tar.gz .
23+
ADD or-tools_amd64_rockylinux-10_python_v*.tar.gz .
2424

2525
RUN cd or-tools_*_v* && make test

0 commit comments

Comments
 (0)