From 7116903afdc8aaff562cadbb9365f701eadb48bd Mon Sep 17 00:00:00 2001 From: Kouhai Date: Wed, 5 Jul 2023 00:27:37 -0700 Subject: [PATCH] th: update ruby --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2868cd73ad..3773cdba6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1.4 # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim -ARG NODE_VERSION="18.16-bullseye-slim" +ARG NODE_IMAGE=node:18.16-bullseye-slim +ARG RUBY_IMAGE=ghcr.io/moritzheiber/ruby-jemalloc:3.2.2-slim -FROM ghcr.io/moritzheiber/ruby-jemalloc:3.2.1-slim as ruby -FROM node:${NODE_VERSION} as build-base +FROM ${RUBY_IMAGE} as ruby +FROM ${NODE_IMAGE} as build-base COPY --link --from=ruby /opt/ruby /opt/ruby @@ -62,7 +63,7 @@ RUN mv ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json && yarn ins bundle exec rails assets:precompile -FROM node:${NODE_VERSION} +FROM ${NODE_IMAGE} # Use those args to specify your own version flags & suffixes ARG MASTODON_VERSION_FLAGS=""