NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-10 10:32:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Ruby 2.7 images for GitLab CE/EE images

Browse source 
Ruby 2.7.1 is only available on Debian Buster, so we have to upgrade
from Debian Stretch.

Fix install-essentials for Debian 10 (Buster):

1. MySQL client is no longer needed
2. Yank libgdbm3 and libgdbm-dev because it's not clear why it's needed
3. Pull legacy nodejs from Debian Buster builds since Node 12.x conflicted
This commit is contained in:
Stan Hu 2020-08-04 10:39:48 -07:00
parent 25174a3ef3
commit a7a13a87d6
3 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/custom-docker-build
View file

@ -213,9 +213,17 @@ function parse_arguments() {
read base
read base_version
# Lock Ruby to Debian stretch
# Lock Ruby to Debian version to pin OpenSSL version
case "$base" in
ruby) base_version="$base_version-stretch" ;;
ruby)
case "$base_version" in
2.6.*)
base_version="$base_version-stretch"
;;
*)
base_version="$base_version-buster"
;;
esac
esac
printf -- "-f Dockerfile.custom " "$base"