tools/docker: Fix almalinux export

google · Aug 30, 2024 · 8d60e85 · 8d60e85
1 parent 887502b
commit 8d60e85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/tools/docker/Makefile b/tools/docker/Makefile
@@ -444,7 +444,7 @@ cache/$1/$2/docker_$3.tar: $1_$2_$3
 .PHONY: sh_$1_$2_$3
 sh_$1_$2_$3: $1_$2_$3 | export
 	${DOCKER_RUN_CMD} \
- -v `pwd`/export:/export \
+ -v $$$$(pwd)/export:/export \
  -it \
  --name ortools_$$< \
  ${IMAGE}:$$<
@@ -499,7 +499,7 @@ cache/$1/$2/docker_$3_$4.tar: $1_$2_$3_$4
 .PHONY: sh_$1_$2_$3_$4
 sh_$1_$2_$3_$4: $1_$2_$3_$4 | export
 	${DOCKER_RUN_CMD} \
- -v `pwd`/export:/export \
+ -v $$$$(pwd)/export:/export \
  -it \
  --name ortools_$$< \
  ${IMAGE}:$$<
@@ -539,9 +539,9 @@ export/archives/or-tools_$1_$2_$3_v${OR_TOOLS_VERSION}.tar.gz: $1_$2_$3_archive
 	-mkdir -p export/$1/$2
 	${DOCKER_RUN_CMD} \
  -w /root/or-tools \
- -v `pwd`/export:/export \
+ -v $$$$(pwd)/export:/export \
  ${IMAGE}:$$< \
- "cp or-tools_*_v*.tar.gz /export/$1/$2"
+ "cp or-tools_*_v*.tar.gz /export/$1/$2/"
 	cp export/$1/$2/or-tools_*_$3*_v*.tar.gz $$@
 
 .PHONY: clean_$1_$2_$3_export

diff --git a/tools/docker/images/almalinux-9.Dockerfile b/tools/docker/images/almalinux-9.Dockerfile
@@ -10,6 +10,7 @@ RUN dnf -y update \
 && 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

diff --git a/tools/docker/images/rockylinux-9.Dockerfile b/tools/docker/images/rockylinux-9.Dockerfile
@@ -10,6 +10,7 @@ RUN dnf -y update \
 && 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