diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu index f3dc045f11..3fd3a48ace 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu @@ -83,7 +83,12 @@ RUN {{InsertTemplate("../Dockerfile.linux.download-files", ["files": [[ "url": rocksToolboxUrl, "out-file": "/usr/bin/chisel-wrapper" ]]], " ")}} \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN {{InsertTemplate("Dockerfile.linux.non-root-user-staged", [ "staging-dir": "/rootfs", diff --git a/manifest.versions.json b/manifest.versions.json index 0aaf3746e9..8138a67e8d 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -43,14 +43,14 @@ "aspnet|11.0|build-version": "11.0.0-rc.2.26467.104", "aspnet-composite|11.0|build-version": "$(aspnet|11.0|build-version)", - "chisel|latest|build-version": "v1.4.2", + "chisel|latest|build-version": "v1.5.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|build-version": "$(chisel|latest|build-version)", - "chisel|11.0|x64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|11.0|build-version)/chisel_$(chisel|11.0|build-version)_linux_amd64.tar.gz", - "chisel|11.0|arm|url": "https://github.com/canonical/chisel/releases/download/$(chisel|11.0|build-version)/chisel_$(chisel|11.0|build-version)_linux_arm.tar.gz", - "chisel|11.0|arm64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|11.0|build-version)/chisel_$(chisel|11.0|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)", @@ -61,9 +61,9 @@ "chisel|8.0|arm|url": "$(chisel|latest|arm|url)", "chisel|8.0|arm64|url": "$(chisel|latest|arm64|url)", - "chisel|latest|x64|sha384": "8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6", - "chisel|latest|arm|sha384": "64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78", - "chisel|latest|arm64|sha384": "216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297", + "chisel|latest|x64|sha384": "f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c", + "chisel|latest|arm|sha384": "271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d", + "chisel|latest|arm64|sha384": "90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91", "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)", 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 a493707f36..1d66f006bc 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 64d8536ae0..783b80eca9 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 c47f6a33a4..58ee08a19a 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile index 92b8de3cd8..4b04fda52d 100644 --- a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile index 22d4bf6433..3042801c85 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile index 9e7e0215e0..f6af6018e9 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled-extra/amd64/Dockerfile index 65f7ba54b5..4d882d5f3e 100644 --- a/src/runtime-deps/10.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled-extra/arm32v7/Dockerfile index d70cc5655a..7534060c01 100644 --- a/src/runtime-deps/10.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled-extra/arm64v8/Dockerfile index 6ccb910b67..b5da587947 100644 --- a/src/runtime-deps/10.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled/amd64/Dockerfile index 6095e97e88..cbac1c1832 100644 --- a/src/runtime-deps/10.0/resolute-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled/arm32v7/Dockerfile index 56918f1074..439e7f9669 100644 --- a/src/runtime-deps/10.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/10.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/10.0/resolute-chiseled/arm64v8/Dockerfile index c460be0c1e..df21d602da 100644 --- a/src/runtime-deps/10.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/resolute-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 65f7ba54b5..4d882d5f3e 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 d70cc5655a..7534060c01 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 6ccb910b67..b5da587947 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile index 6095e97e88..cbac1c1832 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile index 56918f1074..439e7f9669 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile index c460be0c1e..df21d602da 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 e505eabdd2..46000660ab 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 27650d1176..a6c99726f5 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 5bf06a8323..15bdf4e473 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile index 51746e4daa..147081ad6b 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile index 717ffc148c..4acfe4e0ef 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile index 6ebdf8c44d..365e72d305 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 af9b256f69..d3c1965df4 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 f584ac1e6d..14ded9b63c 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile index d4f0eb6f8e..e08a2a8def 100644 --- a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile index f4cd61522a..bb8b966a38 100644 --- a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 0fa2a48fbe..0a6914ef42 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 ac1d483134..bb2c087e9e 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 f1c8efd1aa..1158d6fedf 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile index b9e27fbc02..a6d98d7cf6 100644 --- a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile @@ -2,13 +2,18 @@ FROM amd64/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_amd64.tar.gz \ - && chisel_sha384='8e5e8df4dc783dcfa827ca9990ba871af350738de67c51706b3c06bfd4725ab0edbddd9ad4110d1047ecfdc586f7dac6' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_amd64.tar.gz \ + && chisel_sha384='f8ba3f3d04165b50d91aae7eb3bcaca2a714f1877d2af005989617937cf2e375ab30d4a50b1308263e61a61ecb79de5c' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile index 8037b71e00..2ba3f2991a 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile @@ -2,13 +2,18 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm.tar.gz \ - && chisel_sha384='64564dc399463daba343448533b87eaae0d21f6a32697487957c1ff9c39155269f020b880a40ca27284c6865395f4a78' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm.tar.gz \ + && chisel_sha384='271265a0f21b29270b5ead6b047ab56b1508ab940601a07faf74096f44038d2830863a8a958eea38b39dc405ef8b6c0d' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile index bb02f513dc..ada99c2f1d 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile @@ -2,13 +2,18 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel 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.4.2/chisel_v1.4.2_linux_arm64.tar.gz \ - && chisel_sha384='216f10d4cc461411558fa4ac03fc24e104589126f87657457877389ae8015e1eac4299fcd8557c0dfea3d33342aa3297' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.5.0/chisel_v1.5.0_linux_arm64.tar.gz \ + && chisel_sha384='90d2f15242594a20d634a66ed7a2bee7586cfd83498f42b284ca2dcb6ccd29772230172604881e168b5fc12ffd8dda91' \ && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..5ce29ab99a 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..3987a7c154 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..ff31f2697f 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..5b848c7d67 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..e4289f4a77 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..242ac28446 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-amd64-Dockerfile.approved.txt index 0bbb0335c9..83b7cb65a2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index e7c0c971b0..2e9cb95856 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index a2de6a0781..2eb947bb4f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index f132ffa5b0..fe8f8fed1c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index 90f4819a93..69cb65b7f3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index 2ebdf760ac..8804d28693 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..83b7cb65a2 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..2e9cb95856 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..2eb947bb4f 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 f132ffa5b0..fe8f8fed1c 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 90f4819a93..69cb65b7f3 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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 2ebdf760ac..8804d28693 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..d595276e1f 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..b0a1b7c466 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..74e9cdee6d 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..341b93b6b7 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..ece0f075e3 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..09a633c339 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..1c3b9b99a5 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..5b9fd68f31 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..d4d8800765 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..86dd99bcc9 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..840b833e95 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..e584b2e8d8 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..a3b391b492 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..f3efebd503 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..f36975dddd 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \ 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..9b21174080 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 @@ -8,7 +8,12 @@ RUN curl --fail --show-error --location --output chisel.tar.gz https://github.co && 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 \ - && chmod 755 /usr/bin/chisel-wrapper + && chmod 755 /usr/bin/chisel-wrapper \ + # Workaround for https://github.com/canonical/rocks-toolbox/issues/55 + && sed --in-place \ + -e 's|dir="$CHISEL_CACHE_DIR/chisel/sha256"|dir="$CHISEL_CACHE_DIR/chisel"|' \ + -e 's|for f in "$dir"/\*; do|for f in "$dir"/sha*/*; do|' \ + /usr/bin/chisel-wrapper RUN groupadd \ --gid=1654 \