From 1ecf4ac1027fa789db94c1ef7744692a71aa841b Mon Sep 17 00:00:00 2001 From: Nulo Date: Sat, 11 Dec 2021 16:38:16 -0300 Subject: [PATCH] Revert "Only define ARGs at the top" This reverts commit 6c0ae9349d89e6fbf71f49bc6679d32d65c45320. --- Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7884493..bf85289 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,10 @@ ARG GID=991 ### Build Hardened Malloc +ARG ALPINE_VERSION FROM docker.io/alpine:${ALPINE_VERSION} as build-malloc +ARG HARDENED_MALLOC_VERSION ARG CONFIG_NATIVE=false COPY thestinger.gpg /tmp/ @@ -24,8 +26,13 @@ RUN apk --no-cache add build-base git gnupg && cd /tmp \ ### Build Mastodon +ARG ALPINE_VERSION + FROM docker.io/alpine:${ALPINE_VERSION} as mastodon-build +ARG MASTODON_VERSION +ARG MASTODON_REPOSITORY + # Install build dependencies RUN apk --no-cache add -t build-dependencies \ build-base \ @@ -67,8 +74,13 @@ RUN yarn install --pure-lockfile --ignore-engines \ ### Mastodon runtime +ARG ALPINE_VERSION + FROM docker.io/alpine:${ALPINE_VERSION} as mastodon +ARG UID +ARG GID + ENV RUN_DB_MIGRATIONS=true \ SIDEKIQ_WORKERS=5 \ BIND=0.0.0.0 \