From ac41a9712ecebdbc991fd290c7ce3236b26bc9cf Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Thu, 4 May 2023 12:33:32 -0700 Subject: [PATCH] Fixed mastodon version injection into containers via github actions (#24858) --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55f7bcf34..91c26d2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,6 @@ # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim ARG NODE_VERSION="16.20-bullseye-slim" -# Use those args to specify your own version flags & suffixes -ARG MASTODON_VERSION_FLAGS="" -ARG MASTODON_VERSION_SUFFIX="" - FROM ghcr.io/moritzheiber/ruby-jemalloc:3.2.2-slim as ruby FROM node:${NODE_VERSION} as build @@ -45,6 +41,10 @@ RUN apt-get update && \ FROM node:${NODE_VERSION} +# Use those args to specify your own version flags & suffixes +ARG MASTODON_VERSION_FLAGS="" +ARG MASTODON_VERSION_SUFFIX="" + ARG UID="991" ARG GID="991"