From 6c2cb4d009c7ae3fce2385e83fe24a8e28970d1d Mon Sep 17 00:00:00 2001 From: Eisuke Kawashima Date: Sun, 20 Jul 2025 02:40:45 +0900 Subject: [PATCH] build: simplify Dockerfile --- Dockerfile.multi-arch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile.multi-arch b/Dockerfile.multi-arch index 217aa74..24ed18c 100644 --- a/Dockerfile.multi-arch +++ b/Dockerfile.multi-arch @@ -5,17 +5,15 @@ ARG tag # Put the right binary for each architecture into place for the # multi-architecture docker image. +ARG url_base="https://github.com/koalaman/shellcheck/releases/download/" RUN set -x; \ arch="$(uname -m)"; \ echo "arch is $arch"; \ if [ "${arch}" = 'armv7l' ]; then \ arch='armv6hf'; \ fi; \ - url_base='https://github.com/koalaman/shellcheck/releases/download/'; \ tar_file="${tag}/shellcheck-${tag}.linux.${arch}.tar.xz"; \ - wget "${url_base}${tar_file}" -O - | tar xJf -; \ - mv "shellcheck-${tag}/shellcheck" /bin/; \ - rm -rf "shellcheck-${tag}"; \ + wget "${url_base}${tar_file}" -O - | tar -C /bin --strip-components=1 -xJf - "shellcheck-${tag}/shellcheck" && \ ls -laF /bin/shellcheck # ShellCheck image