From bfca69665e66da859ddae71af2c34aadce91483e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Borja=20Gonz=C3=A1lez?= <borja@bgon.es>
Date: Thu, 25 Jan 2024 15:28:43 +0100
Subject: [PATCH] Add support to Node 20 (#110)

* add node 20 image

* remove old node images

* fix ruby bundler version incompatibility
---
 README.md               |  2 +-
 docker-compose.node.yml | 19 ++++++-------------
 ruby/Dockerfile         |  3 ++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 5bfc05b..a281be6 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ The development containers on this list are maintained by the Okteto team to hel
 | golang 1.21       | [okteto/golang:1](golang/Dockerfile)         |
 | jdk 17, Gradle 8.2 | [okteto/gradle:6.5](gradle/Dockerfile)       |
 | jdk 17, Maven 3   | [okteto/maven:3-openjdk](maven/Dockerfile)   |
-| node 18           | [okteto/node:18](node/Dockerfile)            |
+| node 20           | [okteto/node:20](node/Dockerfile)            |
 | php 7             | [okteto/php:7](php/Dockerfile)               |
 | python 3          | [okteto/python:3](python/Dockerfile)         |
 | ruby 2            | [okteto/ruby:2](ruby/Dockerfile)             |
diff --git a/docker-compose.node.yml b/docker-compose.node.yml
index e9301ec..dba2517 100644
--- a/docker-compose.node.yml
+++ b/docker-compose.node.yml
@@ -1,24 +1,17 @@
 version: '3.7'
 
 services:
-  node18:
-    image: okteto/node:18
-    build:
-      context: .
-      dockerfile: node/Dockerfile
-      args:
-        VERSION: 18
-  node16:
-    image: okteto/node:16
+  node20:
+    image: okteto/node:20
     build:
       context: .
       dockerfile: node/Dockerfile
       args:
-        VERSION: 16
-  node14:
-    image: okteto/node:14
+        VERSION: 20
+  node18:
+    image: okteto/node:18
     build:
       context: .
       dockerfile: node/Dockerfile
       args:
-        VERSION: 14
+        VERSION: 18
diff --git a/ruby/Dockerfile b/ruby/Dockerfile
index dd684b7..ea497ba 100644
--- a/ruby/Dockerfile
+++ b/ruby/Dockerfile
@@ -6,6 +6,7 @@ WORKDIR /usr/src/app
 # setup okteto message
 COPY bashrc /root/.bashrc
 
-RUN gem install bundler
+# TODO: Forcing bundler version because v2.4.22 was the last one to support ruby v2. We should remove this once we upgrade to ruby v3
+RUN gem install bundler -v 2.4.22
 
 CMD ["bash"]