fix: branch/tag naming conflict for hardened malloc

This commit is contained in:
2026-02-23 16:34:20 +01:00
parent b6ffac045a
commit 2af3f5c9a0

View File

@@ -4,7 +4,7 @@ ARG PHP_VERSION=8.4
ARG NGINX_VERSION=1.28 ARG NGINX_VERSION=1.28
ARG ALPINE_VERSION=3.23 ARG ALPINE_VERSION=3.23
ARG HARDENED_MALLOC_VERSION=16 ARG HARDENED_MALLOC_VERSION=14
ARG SNUFFLEUPAGUS_VERSION=0.13.0 ARG SNUFFLEUPAGUS_VERSION=0.13.0
ARG UID=1000 ARG UID=1000
@@ -94,8 +94,8 @@ ARG VARIANT=light
RUN apk --no-cache add build-base git openssh && cd /tmp \ RUN apk --no-cache add build-base git openssh && cd /tmp \
&& wget -q -O - https://github.com/thestinger.keys | while read -r key; do echo "thestinger@github.com $key"; done > allowed_signers \ && wget -q -O - https://github.com/thestinger.keys | while read -r key; do echo "thestinger@github.com $key"; done > allowed_signers \
&& git config --global gpg.ssh.allowedSignersFile /tmp/allowed_signers \ && git config --global gpg.ssh.allowedSignersFile /tmp/allowed_signers \
&& git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \ && git clone --depth 1 https://github.com/GrapheneOS/hardened_malloc && cd hardened_malloc \
&& cd hardened_malloc && git verify-tag $(git describe --tags) \ && git checkout refs/tags/${HARDENED_MALLOC_VERSION} && git verify-tag $(git describe --tags) \
&& make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT} && make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT}