Skip to content

Commit 8d60e85

Browse files
committed
tools/docker: Fix almalinux export
1 parent 887502b commit 8d60e85

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

tools/docker/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ cache/$1/$2/docker_$3.tar: $1_$2_$3
444444
.PHONY: sh_$1_$2_$3
445445
sh_$1_$2_$3: $1_$2_$3 | export
446446
${DOCKER_RUN_CMD} \
447-
-v `pwd`/export:/export \
447+
-v $$$$(pwd)/export:/export \
448448
-it \
449449
--name ortools_$$< \
450450
${IMAGE}:$$<
@@ -499,7 +499,7 @@ cache/$1/$2/docker_$3_$4.tar: $1_$2_$3_$4
499499
.PHONY: sh_$1_$2_$3_$4
500500
sh_$1_$2_$3_$4: $1_$2_$3_$4 | export
501501
${DOCKER_RUN_CMD} \
502-
-v `pwd`/export:/export \
502+
-v $$$$(pwd)/export:/export \
503503
-it \
504504
--name ortools_$$< \
505505
${IMAGE}:$$<
@@ -539,9 +539,9 @@ export/archives/or-tools_$1_$2_$3_v${OR_TOOLS_VERSION}.tar.gz: $1_$2_$3_archive
539539
-mkdir -p export/$1/$2
540540
${DOCKER_RUN_CMD} \
541541
-w /root/or-tools \
542-
-v `pwd`/export:/export \
542+
-v $$$$(pwd)/export:/export \
543543
${IMAGE}:$$< \
544-
"cp or-tools_*_v*.tar.gz /export/$1/$2"
544+
"cp or-tools_*_v*.tar.gz /export/$1/$2/"
545545
cp export/$1/$2/or-tools_*_$3*_v*.tar.gz $$@
546546

547547
.PHONY: clean_$1_$2_$3_export

tools/docker/images/almalinux-9.Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN dnf -y update \
1010
&& dnf -y groupinstall "Development Tools" \
1111
&& dnf clean all \
1212
&& rm -rf /var/cache/dnf
13+
ENTRYPOINT ["/usr/bin/bash", "-c"]
1314
CMD [ "/usr/bin/bash" ]
1415

1516
# Install SWIG 4.2.1

tools/docker/images/rockylinux-9.Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN dnf -y update \
1010
&& dnf -y groupinstall "Development Tools" \
1111
&& dnf clean all \
1212
&& rm -rf /var/cache/dnf
13+
ENTRYPOINT ["/usr/bin/bash", "-c"]
1314
CMD [ "/usr/bin/bash" ]
1415

1516
# Install SWIG 4.2.1

0 commit comments

Comments
 (0)