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

Fix node-10 support

Browse source
This commit is contained in:
Kamil Trzciński 2021-02-01 14:20:08 +01:00
parent f0bf9d8f0c
commit 255e47d887
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scripts/custom-docker-build
View file

@ -148,11 +148,11 @@ function print_lfs_args() {
function print_node_args() {
case "$1" in
8.x) NODE_INSTALL_VERSION=8.16.0 ;;
10.x) NODE_INSTALL_VERSION=10.16.0 ;;
12.x) NODE_INSTALL_VERSION=12.4.0 ;;
12.18) NODE_INSTALL_VERSION=12.18.4 ;;
14.15) NODE_INSTALL_VERSION=14.15.4 ;;
8|8.x) NODE_INSTALL_VERSION=8.16.0 ;;
10|10.x) NODE_INSTALL_VERSION=10.16.0 ;;
12|12.x) NODE_INSTALL_VERSION=12.4.0 ;;
12|12.18) NODE_INSTALL_VERSION=12.18.4 ;;
14|14.15) NODE_INSTALL_VERSION=14.15.4 ;;
*) echo "Unknown node version $1"; exit 1;
esac
printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
@ -231,6 +231,7 @@ function print_pgbouncer_args() {
function print_ruby_args() {
case "$1" in
2.6|2.6.*)
# 2.6 requires older version of debian
CUSTOM_IMAGE_NAME=debian
CUSTOM_IMAGE_VERSION=stretch
RUBY_VERSION="2.6.6"
@ -238,15 +239,11 @@ function print_ruby_args() {
;;
2.7|2.7.*)
CUSTOM_IMAGE_NAME=debian
CUSTOM_IMAGE_VERSION=buster
RUBY_VERSION="2.7.2"
RUBY_DOWNLOAD_SHA256="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4"
;;
3.0|3.0.*)
CUSTOM_IMAGE_NAME=debian
CUSTOM_IMAGE_VERSION=buster
RUBY_VERSION="3.0.0"
RUBY_DOWNLOAD_SHA256="a13ed141a1c18eb967aac1e33f4d6ad5f21be1ac543c344e0d6feeee54af8e28"
;;
@ -254,8 +251,6 @@ function print_ruby_args() {
*) echo "Unknown ruby version $1"; exit 1;
esac
printf -- "--build-arg CUSTOM_IMAGE_NAME=%s " "$CUSTOM_IMAGE_NAME"
printf -- "--build-arg CUSTOM_IMAGE_VERSION=%s " "$CUSTOM_IMAGE_VERSION"
printf -- "--build-arg RUBY_VERSION=%s " "$RUBY_VERSION"
printf -- "--build-arg RUBY_DOWNLOAD_SHA256=%s " "$RUBY_DOWNLOAD_SHA256"
}
@ -263,6 +258,10 @@ function print_ruby_args() {
function parse_arguments() {
printf -- "-f Dockerfile.custom "
# defaults
CUSTOM_IMAGE_NAME=debian
CUSTOM_IMAGE_VERSION=buster
while read image; do
read version
case "$image" in
@ -282,6 +281,9 @@ function parse_arguments() {
*) exit 1;;
esac
done
printf -- "--build-arg CUSTOM_IMAGE_NAME=%s " "$CUSTOM_IMAGE_NAME"
printf -- "--build-arg CUSTOM_IMAGE_VERSION=%s " "$CUSTOM_IMAGE_VERSION"
}
function generate_command() {

2
scripts/install-ruby
View file

@ -26,7 +26,7 @@ apt-get install -y --no-install-recommends bison dpkg-dev libgdbm-dev ruby
# Unpack Ruby
mkdir -p /usr/src/ruby
tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1
rm ruby.tar.xz
rm ruby.tar.gz
cd /usr/src/ruby
# Apply patches