From 255e47d8874861e2d80cebbd28d208c45cd61d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 1 Feb 2021 14:20:08 +0100
Subject: [PATCH] Fix `node-10` support

---
 scripts/custom-docker-build | 24 +++++++++++++-----------
 scripts/install-ruby        |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index ba3dbf8..a3b60ff 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -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() {
diff --git a/scripts/install-ruby b/scripts/install-ruby
index 90fd24d..6d5280f 100755
--- a/scripts/install-ruby
+++ b/scripts/install-ruby
@@ -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