jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

docker: upgrade Ruby to 3.0.3.

Browse Source 
Upgrade bootsnap to 1.9.3 too because Ruby 3.0.3 has a bug that causes
Rails to fail to boot when bootsnap is enabled. Bootsnap 1.9.3 works
around this bug.

Also add libgmp to build with bignum support.
This commit is contained in:
evazion
2021-11-28 05:08:30 -06:00
parent 1e6f57a9ef
commit 2c63fcf081
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ruby-version
View File

@@ -1 +1 @@
3.0.2 3.0.3

2
Gemfile.lock
View File

@@ -108,7 +108,7 @@ GEM
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (1.0.0) binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootsnap (1.9.1) bootsnap (1.9.3)
msgpack (~> 1.0) msgpack (~> 1.0)
builder (3.2.4) builder (3.2.4)
byebug (11.1.3) byebug (11.1.3)

2
INSTALL.debian
View File

@@ -2,7 +2,7 @@
# Run: curl -L -s https://raw.githubusercontent.com/danbooru/danbooru/master/INSTALL.debian -o install.sh ; chmod +x install.sh ; ./install.sh # Run: curl -L -s https://raw.githubusercontent.com/danbooru/danbooru/master/INSTALL.debian -o install.sh ; chmod +x install.sh ; ./install.sh
export RUBY_VERSION=3.0.2 export RUBY_VERSION=3.0.3
export GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/danbooru/danbooru/master/script/install export GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/danbooru/danbooru/master/script/install
export VIPS_VERSION=8.7.0 export VIPS_VERSION=8.7.0

6
config/docker/build-base-image.sh
View File

@@ -2,7 +2,7 @@
set -xeuo pipefail set -xeuo pipefail
RUBY_VERSION="${RUBY_VERSION:-3.0.2}" RUBY_VERSION="${RUBY_VERSION:-3.0.3}"
VIPS_VERSION="${VIPS_VERSION:-8.12.1}" VIPS_VERSION="${VIPS_VERSION:-8.12.1}"
FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}" FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}"
EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.30}" EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.30}"
@@ -12,7 +12,7 @@ POSTGRESQL_CLIENT_VERSION="${POSTGRESQL_CLIENT_VERSION:-14}"
COMMON_BUILD_DEPS=" COMMON_BUILD_DEPS="
curl ca-certificates build-essential pkg-config git curl ca-certificates build-essential pkg-config git
" "
RUBY_BUILD_DEPS="libssl-dev zlib1g-dev" RUBY_BUILD_DEPS="libssl-dev zlib1g-dev libgmp-dev"
FFMPEG_BUILD_DEPS="libvpx-dev nasm" FFMPEG_BUILD_DEPS="libvpx-dev nasm"
VIPS_BUILD_DEPS=" VIPS_BUILD_DEPS="
libfftw3-dev libwebp-dev liborc-dev liblcms2-dev libpng-dev libfftw3-dev libwebp-dev liborc-dev liblcms2-dev libpng-dev
@@ -20,7 +20,7 @@ VIPS_BUILD_DEPS="
" "
EXIFTOOL_RUNTIME_DEPS="perl perl-modules libarchive-zip-perl" EXIFTOOL_RUNTIME_DEPS="perl perl-modules libarchive-zip-perl"
DANBOORU_RUNTIME_DEPS=" DANBOORU_RUNTIME_DEPS="
ca-certificates mkvtoolnix rclone libpq5 ca-certificates mkvtoolnix rclone libpq5 openssl libgmpxx4ldbl
zlib1g libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 zlib1g libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2
libpng16-16 libjpeg-turbo8 libexpat1 libglib2.0 libgif7 libexif12 libheif1 libvpx6 libpng16-16 libjpeg-turbo8 libexpat1 libglib2.0 libgif7 libexif12 libheif1 libvpx6
libseccomp2 libseccomp-dev libseccomp2 libseccomp-dev