tools/docker: update almalinux and rockylinux

google · Sep 6, 2024 · a8813f1 · a8813f1
1 parent a0f0920
commit a8813f1
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 49 deletions.
diff --git a/tools/docker/images/almalinux-9.Dockerfile b/tools/docker/images/almalinux-9.Dockerfile
@@ -38,9 +38,9 @@ RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 
-# Java Install
+# Install Java 8 SDK
 RUN dnf -y update \
-&& dnf -y install java-1.8.0-openjdk  java-1.8.0-openjdk-devel maven \
+&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 
@@ -74,7 +74,6 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
 # Download sources
 # use SRC_GIT_SHA1 to modify the command
 # i.e. avoid docker reusing the cache when new commit is pushed
-SHELL ["/bin/bash", "-c"]
 RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \
 && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]]
 WORKDIR /root/or-tools

diff --git a/tools/docker/images/rockylinux-9.Dockerfile b/tools/docker/images/rockylinux-9.Dockerfile
@@ -14,7 +14,6 @@ ENTRYPOINT ["/usr/bin/bash", "-c"]
 CMD [ "/usr/bin/bash" ]
 
 # Install SWIG 4.2.1
-FROM base AS swig
 RUN dnf -y update \
 && dnf -y install pcre2-devel \
 && dnf clean all \
@@ -38,9 +37,9 @@ RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 
-# Java Install
+# Install Java 8 SDK
 RUN dnf -y update \
-&& dnf -y install java-1.8.0-openjdk  java-1.8.0-openjdk-devel maven \
+&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 
@@ -74,7 +73,6 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999}
 # Download sources
 # use SRC_GIT_SHA1 to modify the command
 # i.e. avoid docker reusing the cache when new commit is pushed
-SHELL ["/bin/bash", "-c"]
 RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \
 && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]]
 WORKDIR /root/or-tools

diff --git a/tools/docker/test/almalinux-9/cpp.Dockerfile b/tools/docker/test/almalinux-9/cpp.Dockerfile
@@ -4,13 +4,13 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel cmake \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 WORKDIR /root
 ADD or-tools_amd64_almalinux-9_cpp_v*.tar.gz .

diff --git a/tools/docker/test/almalinux-9/dotnet.Dockerfile b/tools/docker/test/almalinux-9/dotnet.Dockerfile
@@ -4,20 +4,18 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install .Net
-# 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 3.1 -i /usr/local/bin \
-&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
+RUN dnf -y update \
+&& dnf -y install dotnet-sdk-6.0 \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 

diff --git a/tools/docker/test/almalinux-9/java.Dockerfile b/tools/docker/test/almalinux-9/java.Dockerfile
@@ -4,17 +4,16 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install Java 8 SDK
 RUN dnf -y update \
-&& dnf -y install java-1.8.0-openjdk  java-1.8.0-openjdk-devel maven \
+&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 

diff --git a/tools/docker/test/almalinux-9/python.Dockerfile b/tools/docker/test/almalinux-9/python.Dockerfile
@@ -4,17 +4,17 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && dnf -y install git wget openssl-devel cmake \
 && dnf -y groupinstall "Development Tools" \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install Python
 RUN dnf -y update \
-&& dnf -y install python3-devel python3-pip python3-numpy \
+&& dnf -y install python3 python3-devel python3-pip python3-numpy \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 RUN python3 -m pip install \

diff --git a/tools/docker/test/rockylinux-9/cpp.Dockerfile b/tools/docker/test/rockylinux-9/cpp.Dockerfile
@@ -4,13 +4,13 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel cmake \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 WORKDIR /root
 ADD or-tools_amd64_rockylinux-9_cpp_v*.tar.gz .

diff --git a/tools/docker/test/rockylinux-9/dotnet.Dockerfile b/tools/docker/test/rockylinux-9/dotnet.Dockerfile
@@ -4,20 +4,18 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install .Net
-# 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 3.1 -i /usr/local/bin \
-&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
+RUN dnf -y update \
+&& dnf -y install dotnet-sdk-6.0 \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 

diff --git a/tools/docker/test/rockylinux-9/java.Dockerfile b/tools/docker/test/rockylinux-9/java.Dockerfile
@@ -4,17 +4,16 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
-&& dnf -y install git wget openssl-devel cmake \
-&& dnf -y groupinstall "Development Tools" \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install Java 8 SDK
 RUN dnf -y update \
-&& dnf -y install java-1.8.0-openjdk  java-1.8.0-openjdk-devel maven \
+&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 

diff --git a/tools/docker/test/rockylinux-9/python.Dockerfile b/tools/docker/test/rockylinux-9/python.Dockerfile
@@ -4,17 +4,17 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
-ENV PATH=/usr/local/bin:$PATH
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && dnf -y install git wget openssl-devel cmake \
 && dnf -y groupinstall "Development Tools" \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-CMD [ "/usr/bin/bash" ]
+#CMD ["/usr/bin/bash"]
 
 # Install Python
 RUN dnf -y update \
-&& dnf -y install python3-devel python3-pip python3-numpy \
+&& dnf -y install python3 python3-devel python3-pip python3-numpy \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 RUN python3 -m pip install \