tool/test-annocheck.sh: Support multiple files in Dockerfile-copy.

junaruga · Jul 24, 2024 · 0317536 · 0317536
1 parent 21351ef
commit 0317536
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/tool/annocheck/Dockerfile-copy b/tool/annocheck/Dockerfile-copy
@@ -1,6 +1,6 @@
 FROM docker.io/fedora:latest
-ARG FILES
+ARG IN_DIR
 
 RUN dnf -y install annobin-annocheck
-COPY ${FILES} /work/
+COPY ${IN_DIR} /work
 WORKDIR /work
diff --git a/tool/test-annocheck.sh b/tool/test-annocheck.sh
@@ -15,6 +15,7 @@ set -x
 DOCKER="$(command -v docker || command -v podman)"
 TAG=ruby-fedora-annocheck
 TOOL_DIR=$(dirname "${0}")
+TMP_DIR="tmp/annocheck"
 DOCKER_RUN_VOLUME_OPTS=
 
 if [ -z "${CI-}" ]; then
@@ -27,8 +28,13 @@ else
   # volume in container in container on GitHub Actions
   # <.github/workflows/compilers.yml>.
   TAG="${TAG}-copy"
-  sed -r "s/\\$\{FILES\}/${*}/" ${TOOL_DIR}/annocheck/Dockerfile-copy | \
-    "${DOCKER}" build --rm -t "${TAG}" --build-arg=FILES="${*}" -f - .
+  rm -rf "${TMP_DIR}"
+  mkdir -p "${TMP_DIR}"
+  for file in ${@}; do
+    cp -p "${file}" "${TMP_DIR}"
+  done
+  "${DOCKER}" build --rm -t "${TAG}" --build-arg=IN_DIR="${TMP_DIR}" -f ${TOOL_DIR}/annocheck/Dockerfile-copy .
+  rm -rf "${TMP_DIR}"
 fi
 
 "${DOCKER}" run --rm -t ${DOCKER_RUN_VOLUME_OPTS} "${TAG}" annocheck --verbose ${TEST_ANNOCHECK_OPTS-} "${@}"