tools/docker: Fixup for almalinux and rockylinux

google · Sep 9, 2024 · 3b6363c · 3b6363c
1 parent 74ef591
commit 3b6363c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/tools/docker/Makefile b/tools/docker/Makefile
@@ -100,13 +100,13 @@ help:
 	@echo -e "\t\t${BOLD}fedora-39${RESET}"
 	@echo -e "\t\t${BOLD}fedora-38${RESET}"
 	@echo -e "\t\t${BOLD}fedora-37${RESET}"
+	@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
+	@echo -e "\t\t${BOLD}rockylinux-9${RESET} (latest)"
 	@echo -e "\t\t${BOLD}ubuntu-24.04${RESET} (Ubuntu 24.04 LTS, latest)"
 	@echo -e "\t\t${BOLD}ubuntu-23.10${RESET} (Ubuntu 23.10, rolling)"
 	@echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04)"
 	@echo -e "\t\t${BOLD}ubuntu-22.04${RESET} (Ubuntu 22.04 LTS)"
 	@echo -e "\t\t${BOLD}ubuntu-20.04${RESET} (Ubuntu 20.04 LTS)"
-	@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
-	@echo -e "\t\t${BOLD}rockylinux-9${RESET} (latest)"
 	@echo
 	@echo -e "\t${BOLD}<stage>${RESET}:"
 	@echo -e "\t\t${BOLD}env${RESET}"
@@ -150,7 +150,7 @@ OR_TOOLS_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 OR_TOOLS_SHA1 := $(shell git rev-parse --verify HEAD)
 # OR_TOOLS_MAJOR & OR_TOOLS_MINOR
 include ../../Version.txt
-OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD)
+OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD || echo 0)
 OR_TOOLS_VERSION := ${OR_TOOLS_MAJOR}.${OR_TOOLS_MINOR}.${OR_TOOLS_PATCH}
 ifdef PRE_RELEASE
 OR_TOOLS_VERSION := ${OR_TOOLS_VERSION}-rc
@@ -412,9 +412,9 @@ DISTROS := \
  archlinux \
  debian-11 debian-12 debian-sid \
  fedora-37 fedora-38 fedora-39 \
- ubuntu-20.04 ubuntu-22.04 ubuntu-23.04 ubuntu-23.10 ubuntu-24.04 \
  opensuse-leap \
- rockylinux-9
+ rockylinux-9 \
+ ubuntu-20.04 ubuntu-22.04 ubuntu-23.04 ubuntu-23.10 ubuntu-24.04
 
 # List of stages
 STAGES := env devel

diff --git a/tools/docker/images/almalinux-9.Dockerfile b/tools/docker/images/almalinux-9.Dockerfile
@@ -11,10 +11,9 @@ RUN dnf -y update \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 ENTRYPOINT ["/usr/bin/bash", "-c"]
-CMD [ "/usr/bin/bash" ]
+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 \
@@ -90,6 +89,7 @@ RUN make archive_cpp
 # .Net
 ## build
 FROM cpp_build AS dotnet_build
+RUN sed -i 's/\(<SignAssembly>\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in
 ENV USE_DOTNET_CORE_31=ON
 RUN make detect_dotnet \
 && make dotnet JOBS=8

diff --git a/tools/docker/images/rockylinux-9.Dockerfile b/tools/docker/images/rockylinux-9.Dockerfile
@@ -11,7 +11,7 @@ RUN dnf -y update \
 && dnf clean all \
 && rm -rf /var/cache/dnf
 ENTRYPOINT ["/usr/bin/bash", "-c"]
-CMD [ "/usr/bin/bash" ]
+CMD ["/usr/bin/bash"]
 
 # Install SWIG 4.2.1
 RUN dnf -y update \
@@ -89,6 +89,7 @@ RUN make archive_cpp
 # .Net
 ## build
 FROM cpp_build AS dotnet_build
+RUN sed -i 's/\(<SignAssembly>\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in
 ENV USE_DOTNET_CORE_31=ON
 RUN make detect_dotnet \
 && make dotnet JOBS=8

diff --git a/tools/docker/test/almalinux-9/java.Dockerfile b/tools/docker/test/almalinux-9/java.Dockerfile
@@ -16,6 +16,7 @@ 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
 
 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
@@ -6,8 +6,7 @@ FROM almalinux:9
 #############
 #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 clean all \
 && rm -rf /var/cache/dnf
 #CMD ["/usr/bin/bash"]

diff --git a/tools/docker/test/rockylinux-9/java.Dockerfile b/tools/docker/test/rockylinux-9/java.Dockerfile
@@ -16,6 +16,7 @@ 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
 
 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
@@ -6,8 +6,7 @@ FROM rockylinux:9
 #############
 #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 clean all \
 && rm -rf /var/cache/dnf
 #CMD ["/usr/bin/bash"]