Revert "Only define ARGs at the top"

This reverts commit 6c0ae9349d.
This commit is contained in:
Cat /dev/Nulo 2021-12-11 16:38:16 -03:00
parent 6c0ae9349d
commit 1ecf4ac102

View file

@ -11,8 +11,10 @@ ARG GID=991
### Build Hardened Malloc ### Build Hardened Malloc
ARG ALPINE_VERSION
FROM docker.io/alpine:${ALPINE_VERSION} as build-malloc FROM docker.io/alpine:${ALPINE_VERSION} as build-malloc
ARG HARDENED_MALLOC_VERSION
ARG CONFIG_NATIVE=false ARG CONFIG_NATIVE=false
COPY thestinger.gpg /tmp/ COPY thestinger.gpg /tmp/
@ -24,8 +26,13 @@ RUN apk --no-cache add build-base git gnupg && cd /tmp \
### Build Mastodon ### Build Mastodon
ARG ALPINE_VERSION
FROM docker.io/alpine:${ALPINE_VERSION} as mastodon-build FROM docker.io/alpine:${ALPINE_VERSION} as mastodon-build
ARG MASTODON_VERSION
ARG MASTODON_REPOSITORY
# Install build dependencies # Install build dependencies
RUN apk --no-cache add -t build-dependencies \ RUN apk --no-cache add -t build-dependencies \
build-base \ build-base \
@ -67,8 +74,13 @@ RUN yarn install --pure-lockfile --ignore-engines \
### Mastodon runtime ### Mastodon runtime
ARG ALPINE_VERSION
FROM docker.io/alpine:${ALPINE_VERSION} as mastodon FROM docker.io/alpine:${ALPINE_VERSION} as mastodon
ARG UID
ARG GID
ENV RUN_DB_MIGRATIONS=true \ ENV RUN_DB_MIGRATIONS=true \
SIDEKIQ_WORKERS=5 \ SIDEKIQ_WORKERS=5 \
BIND=0.0.0.0 \ BIND=0.0.0.0 \