From dd3d12c143eadb838879bffc1e005e18a9f3ab07 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 24 Oct 2025 16:07:58 -0700 Subject: [PATCH 1/3] Use online checksums for downloading Chisel --- documentation/ubuntu-chiseled.md | 4 +- .../Dockerfile.linux.validate-checksum | 5 ++- .../runtime-deps/Dockerfile.chiseled-ubuntu | 39 +++++++++++-------- .../noble-chiseled-extra/amd64/Dockerfile | 18 ++++++--- .../noble-chiseled-extra/arm32v7/Dockerfile | 18 ++++++--- .../noble-chiseled-extra/arm64v8/Dockerfile | 18 ++++++--- .../10.0/noble-chiseled/amd64/Dockerfile | 18 ++++++--- .../10.0/noble-chiseled/arm32v7/Dockerfile | 18 ++++++--- .../10.0/noble-chiseled/arm64v8/Dockerfile | 18 ++++++--- .../8.0/jammy-chiseled-extra/amd64/Dockerfile | 18 ++++++--- .../jammy-chiseled-extra/arm32v7/Dockerfile | 18 ++++++--- .../jammy-chiseled-extra/arm64v8/Dockerfile | 18 ++++++--- .../8.0/jammy-chiseled/amd64/Dockerfile | 18 ++++++--- .../8.0/jammy-chiseled/arm32v7/Dockerfile | 18 ++++++--- .../8.0/jammy-chiseled/arm64v8/Dockerfile | 18 ++++++--- .../8.0/noble-chiseled-extra/amd64/Dockerfile | 18 ++++++--- .../noble-chiseled-extra/arm64v8/Dockerfile | 18 ++++++--- .../8.0/noble-chiseled/amd64/Dockerfile | 18 ++++++--- .../8.0/noble-chiseled/arm64v8/Dockerfile | 18 ++++++--- .../9.0/noble-chiseled-extra/amd64/Dockerfile | 18 ++++++--- .../noble-chiseled-extra/arm32v7/Dockerfile | 18 ++++++--- .../noble-chiseled-extra/arm64v8/Dockerfile | 18 ++++++--- .../9.0/noble-chiseled/amd64/Dockerfile | 18 ++++++--- .../9.0/noble-chiseled/arm32v7/Dockerfile | 18 ++++++--- .../9.0/noble-chiseled/arm64v8/Dockerfile | 18 ++++++--- 25 files changed, 292 insertions(+), 152 deletions(-) diff --git a/documentation/ubuntu-chiseled.md b/documentation/ubuntu-chiseled.md index 56dc075c70..a82aa863dc 100644 --- a/documentation/ubuntu-chiseled.md +++ b/documentation/ubuntu-chiseled.md @@ -56,7 +56,7 @@ FROM mcr.microsoft.com/dotnet/nightly/sdk:10.0-noble AS chisel # Find the latest chisel releases: https://github.com/canonical/chisel/releases ARG CHISEL_VERSION="v1.X.X" # Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases -ARG CHISEL_WRAPPER_VERSION="v1.X.X" +ARG ROCKS_TOOLBOX_VERSION="v1.X.X" # Install chisel's dependencies RUN apt-get update \ @@ -69,7 +69,7 @@ RUN chisel_url=https://github.com/canonical/chisel/releases/download/${CHISEL_VE && curl -fSLOJ ${chisel_url} \ && curl -fSL ${chisel_url}.sha384 | sha384sum -c - \ && tar -xzf chisel_${CHISEL_VERSION}_linux_amd64.tar.gz -C /usr/bin/ chisel \ - && curl -fSL --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${CHISEL_WRAPPER_VERSION}/chisel-wrapper \ + && curl -fSL --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper ``` diff --git a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum index 219f27fd01..99999301fa 100644 --- a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum +++ b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum @@ -23,6 +23,8 @@ names separated by one or two spaces. One line must have a filename matching the file you wish to validate. See `man cksum` or `man sha512sum` for details. + + stdin : Run sha check on standard input ^ set isAlpine to find(OS_VERSION, "alpine") >= 0 ^ @@ -39,7 +41,8 @@ ARGS["sha"])) }}{{ -if (ARGS["sha"] || (ARGS["sha-file"] && ARGS["sha-file-is-bare"])):{{ +if (ARGS["stdin"]):sha{{ARGS["sha-function"]}}sum -c -^ +elif (ARGS["sha"] || (ARGS["sha-file"] && ARGS["sha-file-is-bare"])):{{ if ARGS["sha-var-name"]:{{ARGS["sha-var-name"]}}='{{ARGS["sha"]}}' \ && }}echo "{{shaValue}} {{ARGS["file"]}}" | sha{{ARGS["sha-function"]}}sum -c -^ elif (ARGS["file"]):{{ diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu index f3dc045f11..407270773c 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu @@ -7,13 +7,14 @@ set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ set osVersionNumber to split(OS_ARCH_HYPHENATED, "-")[1] ^ - set chiselUrl to VARIABLES[cat("chisel|", dotnetVersion, "|", ARCH_SHORT, "|url")] ^ - set chiselFileName to "chisel.tar.gz" ^ + set chiselVersion to VARIABLES[cat("chisel|", dotnetVersion, "|build-version")] ^ + set chiselArch to + when(ARCH_SHORT = "arm32", "arm", + when(ARCH_SHORT = "x64", "amd64", + ARCH_SHORT)) ^ + set chiselFile to cat("chisel_${CHISEL_VERSION}_linux_", chiselArch, ".tar.gz") ^ + set rocksToolboxVersion to VARIABLES[cat("rocks-toolbox|", dotnetVersion, "|build-version")] ^ set shaFunction to "384" ^ - set chiselSha to VARIABLES[cat("chisel|", dotnetVersion, "|", ARCH_SHORT, "|sha", shaFunction)] ^ - set rocksToolboxBaseUrl to VARIABLES[cat("rocks-toolbox|", dotnetVersion, "|url")] ^ - set rocksToolboxRef to VARIABLES[cat("rocks-toolbox|", dotnetVersion, "|version")] ^ - set rocksToolboxUrl to cat(rocksToolboxBaseUrl, "/", rocksToolboxRef, "/chisel-wrapper") ^ set installerImageTag to cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl") ^ @@ -62,25 +63,29 @@ }}FROM {{installerImageTag}} AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="{{chiselVersion}}" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="{{rocksToolboxVersion}}" + RUN apt-get update && apt-get install -y file -RUN {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ - "url": chiselUrl, - "out-file": chiselFileName +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_{{chiselArch}}.tar.gz" \ + && {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ + "url": "${chisel_url}" ]]], " ")}} \ - && {{InsertTemplate("../Dockerfile.linux.validate-checksum", [ - "file": chiselFileName, - "sha-function": shaFunction, - "sha": chiselSha, - "sha-var-name": cat("chisel_sha", shaFunction) + && curl --fail --show-error --location ${chisel_url}.sha{{shaFunction}} | {{InsertTemplate("../Dockerfile.linux.validate-checksum", [ + "stdin": "true", + "sha-function": shaFunction ], " ")}} \ && {{InsertTemplate("../Dockerfile.linux.extract-file", [ - "file": chiselFileName, + "file": chiselFile, "dest-dir": "/usr/bin/" ], " ")}} \ - && rm {{chiselFileName}} \ + && rm {{chiselFile}} \ && {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ - "url": rocksToolboxUrl, + "url": "https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper", "out-file": "/usr/bin/chisel-wrapper" ]]], " ")}} \ && chmod 755 /usr/bin/chisel-wrapper diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile index ecd88fc7b9..55e4a0b8e6 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile index d976820ebf..3552c11a91 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile index 4f29219fe8..c39f17030f 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile index 87acfe8b95..3da3f5fd6d 100644 --- a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile index 2be7ef5c00..c4d5eab40e 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile index 89c07ffc2a..e78969efb3 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile index 89ab3cfdee..4d116f5e43 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile index 4d92f68d55..8a5502d8dc 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile index 90d5f25667..e21494dbaf 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile index 776dc1716c..44171b2d4a 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile index c53fae522f..b58e9da82b 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile index 2ee96e6036..3185bc9bcb 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile index a28669965e..086117e7a9 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile index 4a649d715e..b8a09ff128 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile index fc83967ae2..fad1d10abe 100644 --- a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile index 0899e2dbc0..500fba512b 100644 --- a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile index c2eba0f2e5..45c28f1f23 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile index 7b3e2f7cb7..471c0748d1 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile index bd8f972aae..b7b44bcab0 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile index 5ea4b670ea..0ed7263171 100644 --- a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile index 9ed51b529c..d26530bfe2 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile index 70b9f3f4e3..070440d12c 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ From 872eec76733dfbac4b61ce6c9471e55c346ffaff Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 26 Feb 2026 16:55:02 -0800 Subject: [PATCH 2/3] Update Chisel and Rocks Toolbox version definitions in manifest.versions.json --- manifest.versions.json | 50 ++++--------------- .../resolute-chiseled-extra/amd64/Dockerfile | 18 ++++--- .../arm32v7/Dockerfile | 18 ++++--- .../arm64v8/Dockerfile | 18 ++++--- .../11.0/resolute-chiseled/amd64/Dockerfile | 18 ++++--- .../11.0/resolute-chiseled/arm32v7/Dockerfile | 18 ++++--- .../11.0/resolute-chiseled/arm64v8/Dockerfile | 18 ++++--- 7 files changed, 81 insertions(+), 77 deletions(-) diff --git a/manifest.versions.json b/manifest.versions.json index 5e119333c7..aeac7a8243 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -41,37 +41,10 @@ "aspnet-composite|11.0|build-version": "$(aspnet|11.0|build-version)", "chisel|latest|build-version": "v1.3.0", - "chisel|latest|x64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_amd64.tar.gz", - "chisel|latest|arm|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_arm.tar.gz", - "chisel|latest|arm64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_arm64.tar.gz", - "chisel|11.0|x64|url": "$(chisel|latest|x64|url)", - "chisel|11.0|arm|url": "$(chisel|latest|arm|url)", - "chisel|11.0|arm64|url": "$(chisel|latest|arm64|url)", - "chisel|10.0|x64|url": "$(chisel|latest|x64|url)", - "chisel|10.0|arm|url": "$(chisel|latest|arm|url)", - "chisel|10.0|arm64|url": "$(chisel|latest|arm64|url)", - "chisel|9.0|x64|url": "$(chisel|latest|x64|url)", - "chisel|9.0|arm|url": "$(chisel|latest|arm|url)", - "chisel|9.0|arm64|url": "$(chisel|latest|arm64|url)", - "chisel|8.0|x64|url": "$(chisel|latest|x64|url)", - "chisel|8.0|arm|url": "$(chisel|latest|arm|url)", - "chisel|8.0|arm64|url": "$(chisel|latest|arm64|url)", - - "chisel|latest|x64|sha384": "8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9", - "chisel|latest|arm|sha384": "fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb", - "chisel|latest|arm64|sha384": "5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b", - "chisel|10.0|x64|sha384": "$(chisel|latest|x64|sha384)", - "chisel|10.0|arm|sha384": "$(chisel|latest|arm|sha384)", - "chisel|10.0|arm64|sha384": "$(chisel|latest|arm64|sha384)", - "chisel|11.0|x64|sha384": "$(chisel|latest|x64|sha384)", - "chisel|11.0|arm|sha384": "$(chisel|latest|arm|sha384)", - "chisel|11.0|arm64|sha384": "$(chisel|latest|arm64|sha384)", - "chisel|9.0|x64|sha384": "$(chisel|latest|x64|sha384)", - "chisel|9.0|arm|sha384": "$(chisel|latest|arm|sha384)", - "chisel|9.0|arm64|sha384": "$(chisel|latest|arm64|sha384)", - "chisel|8.0|x64|sha384": "$(chisel|latest|x64|sha384)", - "chisel|8.0|arm|sha384": "$(chisel|latest|arm|sha384)", - "chisel|8.0|arm64|sha384": "$(chisel|latest|arm64|sha384)", + "chisel|11.0|build-version": "$(chisel|latest|build-version)", + "chisel|10.0|build-version": "$(chisel|latest|build-version)", + "chisel|9.0|build-version": "$(chisel|latest|build-version)", + "chisel|8.0|build-version": "$(chisel|latest|build-version)", "dotnet|8.0|product-version": "8.0.24", "dotnet|8.0|fixed-tag": "$(dotnet|8.0|product-version)", @@ -213,16 +186,11 @@ "yarp|2.3|dotnet-version": "9.0", "rocks-toolbox|latest|url": "https://raw.githubusercontent.com/canonical/rocks-toolbox", - "rocks-toolbox|8.0|url": "$(rocks-toolbox|latest|url)", - "rocks-toolbox|9.0|url": "$(rocks-toolbox|latest|url)", - "rocks-toolbox|10.0|url": "$(rocks-toolbox|latest|url)", - "rocks-toolbox|11.0|url": "$(rocks-toolbox|latest|url)", - - "rocks-toolbox|latest|version": "v1.2.0", - "rocks-toolbox|8.0|version": "$(rocks-toolbox|latest|version)", - "rocks-toolbox|9.0|version": "$(rocks-toolbox|latest|version)", - "rocks-toolbox|10.0|version": "$(rocks-toolbox|latest|version)", - "rocks-toolbox|11.0|version": "$(rocks-toolbox|latest|version)", + "rocks-toolbox|latest|build-version": "v1.2.0", + "rocks-toolbox|11.0|build-version": "$(rocks-toolbox|latest|build-version)", + "rocks-toolbox|10.0|build-version": "$(rocks-toolbox|latest|build-version)", + "rocks-toolbox|9.0|build-version": "$(rocks-toolbox|latest|build-version)", + "rocks-toolbox|8.0|build-version": "$(rocks-toolbox|latest|build-version)", "runtime|8.0|build-version": "8.0.24", "runtime|9.0|build-version": "9.0.13", diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile index b17a1d4d25..49e2fc7dc0 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile index 0feaa21282..e31bd17095 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile index 8ee322b566..4189978ec6 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile index 7a8ed94923..b62e3630e3 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile index fe1a5034ad..572b8a1b85 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile index dc37fc9eda..f3b1271114 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v1.3.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v1.2.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ From 9c985e43a20112aa9c2d51c3e140761cc3397dc3 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 27 Feb 2026 08:37:45 -0800 Subject: [PATCH 3/3] Update test baselines --- ...oble-chiseled-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...le-chiseled-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...le-chiseled-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...hiseled-extra-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...lute-chiseled-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...te-chiseled-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...te-chiseled-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...hiseled-extra-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...ammy-chiseled-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...my-chiseled-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...my-chiseled-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...hiseled-extra-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...oble-chiseled-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...le-chiseled-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...hiseled-extra-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...oble-chiseled-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...le-chiseled-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...le-chiseled-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ ...hiseled-extra-amd64-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm32v7-Dockerfile.approved.txt | 18 ++++++++++++------ ...seled-extra-arm64v8-Dockerfile.approved.txt | 18 ++++++++++++------ 28 files changed, 336 insertions(+), 168 deletions(-) diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-amd64-Dockerfile.approved.txt index 0915fff97d..1dde497dfd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt index b1a8f19a19..9234390e09 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt index d950ea2209..f69ab6dcf1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt index 88505748e9..876684aeec 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt index 690a88178a..bc741849f4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt index 3457cff01f..1bab0d6738 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt index 0bbb0335c9..4d624aa9ba 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index e7c0c971b0..bb78a774b6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index a2de6a0781..9b5f2a25ba 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index 1d2ea4bfea..9c9f9bc103 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index 59ffe12e21..e1957b324a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index 91e2dabd67..f5526e1487 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-amd64-Dockerfile.approved.txt index e29352b609..1db1b8e275 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm32v7-Dockerfile.approved.txt index 83d75d8551..2dc2635568 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm64v8-Dockerfile.approved.txt index 96fedbea7e..f190518c58 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-amd64-Dockerfile.approved.txt index 02ea3f99b6..7043f20b1f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm32v7-Dockerfile.approved.txt index cd42bbbc92..2635f4f7a7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm64v8-Dockerfile.approved.txt index ba48af63f7..cf905c835a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-jammy-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-amd64-Dockerfile.approved.txt index 3980597338..2b15019a30 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-arm64v8-Dockerfile.approved.txt index de54b5f033..bee9e81bfe 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt index 810bce587b..cf00623ef8 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt index 61745162fa..d03a749236 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-amd64-Dockerfile.approved.txt index a6535f66a1..e38790acfd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm32v7-Dockerfile.approved.txt index eec076c529..c947dcd8ba 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm64v8-Dockerfile.approved.txt index f5dd7891a2..c9d87bd9c1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt index b23de1f73c..566c9d4b63 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM amd64/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_amd64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_amd64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_amd64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt index 49fa609e33..ad5054f254 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt index 0b3a3b246e..c06e8736e0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -1,13 +1,19 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel +# Find the latest chisel releases: https://github.com/canonical/chisel/releases +ARG CHISEL_VERSION="v0.0.0" + +# Find the latest chisel-wrapper releases: https://github.com/canonical/rocks-toolbox/releases +ARG ROCKS_TOOLBOX_VERSION="v0.0.0" + RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \ - && chisel_sha384='{sha386_placeholder}' \ - && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ - && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ - && rm chisel.tar.gz \ - && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \ +RUN chisel_url="https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_arm64.tar.gz" \ + && curl --fail --show-error --location --remote-name ${chisel_url} \ + && curl --fail --show-error --location ${chisel_url}.sha384 | sha384sum -c - \ + && tar --gzip --extract --no-same-owner --file chisel_${CHISEL_VERSION}_linux_arm64.tar.gz --directory /usr/bin/ \ + && rm chisel_${CHISEL_VERSION}_linux_arm64.tar.gz \ + && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/${ROCKS_TOOLBOX_VERSION}/chisel-wrapper \ && chmod 755 /usr/bin/chisel-wrapper RUN groupadd \