tools/docker: clean almalinux and rockylinux

google · Sep 6, 2024 · aa500e9 · aa500e9
1 parent a61566a
commit aa500e9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/tools/docker/images/almalinux-9.Dockerfile b/tools/docker/images/almalinux-9.Dockerfile
@@ -4,12 +4,12 @@ FROM almalinux:9 AS env
 #############
 ##  SETUP  ##
 #############
-#ENV PATH=/root/.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
+ENTRYPOINT ["/usr/bin/bash", "-c"]
 CMD [ "/usr/bin/bash" ]
 
 # Install SWIG 4.2.1
@@ -58,6 +58,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ##  OR-TOOLS  ##
 ################
 FROM env AS devel
+ENV DISTRIBUTION=almalinux-9
+
 WORKDIR /root
 # Copy the snk key
 COPY or-tools.snk /root/or-tools.snk

diff --git a/tools/docker/images/rockylinux-9.Dockerfile b/tools/docker/images/rockylinux-9.Dockerfile
@@ -4,12 +4,12 @@ FROM rockylinux:9 AS env
 #############
 ##  SETUP  ##
 #############
-#ENV PATH=/root/.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
+ENTRYPOINT ["/usr/bin/bash", "-c"]
 CMD [ "/usr/bin/bash" ]
 
 # Install SWIG 4.2.1
@@ -58,6 +58,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ##  OR-TOOLS  ##
 ################
 FROM env AS devel
+ENV DISTRIBUTION=rockylinux-9
+
 WORKDIR /root
 # Copy the snk key
 COPY or-tools.snk /root/or-tools.snk

diff --git a/tools/docker/test/almalinux-9/python.Dockerfile b/tools/docker/test/almalinux-9/python.Dockerfile
@@ -4,16 +4,19 @@ FROM almalinux:9
 #############
 ##  SETUP  ##
 #############
-RUN yum -y update \
-&& yum -y groupinstall 'Development Tools' \
-&& yum clean all \
-&& rm -rf /var/cache/yum
+RUN dnf -y update \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
+CMD ["/usr/bin/bash"]
 
 # Install Python
-RUN yum -y update \
-&& yum -y install python3 python3-devel python3-pip python3-numpy \
-&& yum clean all \
-&& rm -rf /var/cache/yum
+RUN dnf -y update \
+&& dnf -y install python3 python3-devel python3-pip python3-numpy \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
+RUN python3 -m pip install \
+ absl-py mypy mypy-protobuf pandas
 
 WORKDIR /root
 ADD or-tools_amd64_almalinux-9_python_v*.tar.gz .

diff --git a/tools/docker/test/rockylinux-9/python.Dockerfile b/tools/docker/test/rockylinux-9/python.Dockerfile
@@ -4,16 +4,19 @@ FROM rockylinux:9
 #############
 ##  SETUP  ##
 #############
-RUN yum -y update \
-&& yum -y groupinstall 'Development Tools' \
-&& yum clean all \
-&& rm -rf /var/cache/yum
+RUN dnf -y update \
+&& dnf -y groupinstall 'Development Tools' \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
+CMD ["/usr/bin/bash"]
 
 # Install Python
-RUN yum -y update \
-&& yum -y install python3 python3-devel python3-pip python3-numpy \
-&& yum clean all \
-&& rm -rf /var/cache/yum
+RUN dnf -y update \
+&& dnf -y install python3 python3-devel python3-pip python3-numpy \
+&& dnf clean all \
+&& rm -rf /var/cache/dnf
+RUN python3 -m pip install \
+ absl-py mypy mypy-protobuf pandas
 
 WORKDIR /root
 ADD or-tools_amd64_rockylinux-9_python_v*.tar.gz .