tools/docker: cleaning alma and rocky

google · Sep 6, 2024 · 9c67661 · 9c67661
1 parent 634c6b5
commit 9c67661
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/tools/docker/test/almalinux-9/cpp.Dockerfile b/tools/docker/test/almalinux-9/cpp.Dockerfile
@@ -4,12 +4,13 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && 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
@@ -9,6 +9,7 @@ RUN dnf -y update \
 && dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
+#CMD ["/usr/bin/bash"]
 
 # Install .Net
 RUN dnf -y update \

diff --git a/tools/docker/test/almalinux-9/java.Dockerfile b/tools/docker/test/almalinux-9/java.Dockerfile
@@ -9,13 +9,14 @@ RUN dnf -y update \
 && dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
+#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 clean all \
 && rm -rf /var/cache/dnf
-ENV JAVA_HOME=/usr/lib/jvm/java
+#ENV JAVA_HOME=/usr/lib/jvm/java
 
 WORKDIR /root
 ADD or-tools_amd64_almalinux-9_java_v*.tar.gz .

diff --git a/tools/docker/test/almalinux-9/python.Dockerfile b/tools/docker/test/almalinux-9/python.Dockerfile
@@ -4,11 +4,12 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && 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 \

diff --git a/tools/docker/test/rockylinux-9/cpp.Dockerfile b/tools/docker/test/rockylinux-9/cpp.Dockerfile
@@ -4,12 +4,13 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && 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
@@ -9,6 +9,7 @@ RUN dnf -y update \
 && dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
+#CMD ["/usr/bin/bash"]
 
 # Install .Net
 RUN dnf -y update \

diff --git a/tools/docker/test/rockylinux-9/java.Dockerfile b/tools/docker/test/rockylinux-9/java.Dockerfile
@@ -9,13 +9,14 @@ RUN dnf -y update \
 && dnf -y install zlib-devel \
 && dnf clean all \
 && rm -rf /var/cache/dnf
+#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 clean all \
 && rm -rf /var/cache/dnf
-ENV JAVA_HOME=/usr/lib/jvm/java
+#ENV JAVA_HOME=/usr/lib/jvm/java
 
 WORKDIR /root
 ADD or-tools_amd64_rockylinux-9_java_v*.tar.gz .

diff --git a/tools/docker/test/rockylinux-9/python.Dockerfile b/tools/docker/test/rockylinux-9/python.Dockerfile
@@ -4,11 +4,12 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
+#ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && 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 \