From ff9a520e290ba27c4139eecb9d4d38d25e5940d1 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 14 Sep 2021 04:28:57 -0500
Subject: [PATCH] docker: update Ruby to 2.7.4, FFmpeg to 4.4.

---
 config/docker/Dockerfile.danbooru | 10 +---------
 config/docker/build-base-image.sh |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru
index d2844a00f..d1b141f9e 100644
--- a/config/docker/Dockerfile.danbooru
+++ b/config/docker/Dockerfile.danbooru
@@ -1,11 +1,3 @@
-ARG RUBY_VERSION=2.7.1
-ARG NODE_VERSION=14.15.5
-ARG VIPS_VERSION=8.10.6
-ARG FFMPEG_VERSION=4.3.2
-ARG EXIFTOOL_VERSION=12.30
-
-
-
 FROM ubuntu:20.10 AS base
 
 WORKDIR /danbooru
@@ -22,7 +14,7 @@ RUN \
 
 
 FROM base AS development
-ARG NODE_VERSION
+ARG NODE_VERSION=14.15.5
 
 RUN \
   apt-get update && \
diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh
index 944641c9a..d6628d11a 100755
--- a/config/docker/build-base-image.sh
+++ b/config/docker/build-base-image.sh
@@ -2,9 +2,9 @@
 
 set -xeuo pipefail
 
-RUBY_VERSION="${RUBY_VERSION:-2.7.1}"
+RUBY_VERSION="${RUBY_VERSION:-2.7.4}"
 VIPS_VERSION="${VIPS_VERSION:-8.10.6}"
-FFMPEG_VERSION="${FFMPEG_VERSION:-4.3.2}"
+FFMPEG_VERSION="${FFMPEG_VERSION:-4.4}"
 EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.30}"
 OPENRESTY_VERSION="${OPENRESTY_VERSION:-1.19.9.1}"