From eb94272878dd51f30a925099003afe10e12cb147 Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Wed, 2 Jun 2021 03:09:55 +0200 Subject: [PATCH] disable CONFIG_NATIVE for hmalloc (see #82) --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index af7d42e..596aaa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,11 +68,13 @@ ARG ALPINE_VERSION FROM alpine:${ALPINE_VERSION} as build-malloc ARG HARDENED_MALLOC_VERSION +ARG CONFIG_NATIVE=false -RUN apk --no-cache add build-base && cd /tmp \ - && wget -q https://github.com/GrapheneOS/hardened_malloc/archive/refs/tags/${HARDENED_MALLOC_VERSION}.tar.gz \ - && mkdir hardened_malloc && tar xf ${HARDENED_MALLOC_VERSION}.tar.gz -C hardened_malloc --strip-components 1 \ - && cd hardened_malloc && make +RUN apk --no-cache add build-base git gnupg && cd /tmp \ + && wget -q https://github.com/thestinger.gpg && gpg --import thestinger.gpg \ + && git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \ + && cd hardened_malloc && git verify-tag $(git describe --tags) \ + && make CONFIG_NATIVE=${CONFIG_NATIVE} ### Fetch nginx