Skip to content

Commit 971467d

Browse files
authored
chore: process review comments
1 parent 280c39f commit 971467d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# hadolint global ignore=DL3006
33

44
ARG BASE_IMAGE=ghcr.io/philips-software/amp-devcontainer-base:edge
5+
# Public minisign key for verifying ccache releases,
6+
# taken from https://ccache.dev/minisign.pub
7+
ARG CCACHE_MINISIGN_PUBKEY=RWQX7yXbBedVfI4PNx6FLdFXu9GHUFsr28s4BVGxm4BeybtnX3P06saF
58
ARG CCACHE_VERSION=4.13.1
69
ARG XWIN_VERSION=0.8.0
710

@@ -44,6 +47,7 @@ ADD --checksum=sha256:db2938ce5fd422f2db7a07508452772c945135d99274004c462190c323
4447
# Extractor stage using target architecture specific downloader
4548
FROM ${BASE_IMAGE} AS extractor
4649

50+
ARG CCACHE_MINISIGN_PUBKEY
4751
ARG CCACHE_VERSION
4852
ARG XWIN_VERSION
4953

@@ -69,7 +73,7 @@ RUN --mount=from=downloader,target=/dl \
6973
wget --no-hsts -qO "${ARM_GNU_TOOLCHAIN_TAR}" "${ARM_GNU_TOOLCHAIN_URL}"
7074
echo "${ARM_GNU_TOOLCHAIN_SHA256} ${ARM_GNU_TOOLCHAIN_TAR}" | sha256sum -c -
7175

72-
minisign -P RWQX7yXbBedVfI4PNx6FLdFXu9GHUFsr28s4BVGxm4BeybtnX3P06saF -Vm /dl/ccache.tar.xz
76+
minisign -P "${CCACHE_MINISIGN_PUBKEY}" -Vm /dl/ccache.tar.xz
7377

7478
tar xJf "${ARM_GNU_TOOLCHAIN_TAR}" --exclude="*arm-none-eabi-gdb*" --exclude="share"
7579
tar xJf /dl/ccache.tar.xz --strip-components=1 "ccache-${CCACHE_VERSION}-linux-$(uname -m)-glibc/ccache"

0 commit comments

Comments
 (0)