From f1b58abf07d781d8b242b51f135bf44546a2040e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 Aug 2024 16:20:06 +1000 Subject: [PATCH] MDBF-778: no-galera - adjust debian.Dockerfile to remove ARCH= This ensure that hadolint doesn't fail with: /mnt/Dockerfile:28 SC2034 warning: ARCH appears unused. Verify use (or export if used externally). --- ci_build_images/debian.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index 4dd8e30f..e47f903a 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -35,7 +35,7 @@ RUN . /etc/os-release \ equivs \ lsb-release \ && if [ "${VERSION_ID}" = "20.04" ]; then apt-get -y install --no-install-recommends g++-10; fi \ - && if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); fi \ + && if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); echo /* galera-4 */; fi \ && if curl --head --silent "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" | head -n1 | grep -q 200; then \ curl -s "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources; fi \ && apt-get update \