archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2899 from kkimurak/ruby3.2.x-backport-16.7.x

Browse Source 
Backport to 16.7.x : Update Ruby to 3.2.3
This commit is contained in:
Steven Achilles 2024-02-12 19:40:00 +01:00 committed by GitHub
commit da4e3bc244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -3,8 +3,8 @@ FROM ubuntu:focal-20231211
ARG VERSION=16.7.4
ENV GITLAB_VERSION=${VERSION} \
RUBY_VERSION=3.1.4 \
RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
RUBY_VERSION=3.2.3 \
RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
GOLANG_VERSION=1.21.6 \
GITLAB_SHELL_VERSION=14.32.0 \
GITLAB_PAGES_VERSION=16.7.4 \

4
assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
View File

@ -11,8 +11,8 @@ index b8a6e7018767..5096d81ea63f 100644
+ # so do not remove the directory directly, empty instead
+ # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually
+ removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js')
+ if Dir.exists?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
+ if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
+ end
+ FileUtils.rm_rf(removal_targets, secure: true)