From ded830755666216d073744616f691665d8bd207e Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sun, 11 Jan 2026 21:58:55 -0800 Subject: [PATCH] Dockerfile: update dev deps Hack scripts require make and bash that was missing in the dev Dockerfile stage. Signed-off-by: Tonis Tiigi (cherry picked from commit 26ffd457330d7880fa1c9693acfa4a6448407dd8) --- Dockerfile | 2 ++ hack/test | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 941b8863c..ab39ce354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,11 +120,13 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true FROM gobase AS integration-test-base # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN apk add --no-cache \ + bash \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ ip6tables \ iptables \ + make \ openssl \ shadow-uidmap \ xfsprogs \ diff --git a/hack/test b/hack/test index 3aa3ec00f..3eec4460b 100755 --- a/hack/test +++ b/hack/test @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -eu -o pipefail +set -eu : "${GITHUB_ACTIONS=}"