From 84b5a4c3ea46b170d9c0e41607e70fa776657fd5 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Tue, 24 Sep 2024 10:06:36 -0400
Subject: [PATCH] Add a version of Dockerfiles with node included for
 cdt-gdb-adapter

This is a convenience for our sister project, eclipse-cdt-cloud,
that are relying on CDT's infrastructure to do some testing.

See https://github.com/eclipse-cdt-cloud/cdt-gdb-adapter/blob/main/src/integration-tests/README.md#running-the-tests-using-docker
---
 docker/build-images.sh                        |  1 +
 docker/cdt-infra-plus-node/Readme.md          |  2 ++
 .../ubuntu-18.04/Dockerfile                   | 21 +++++++++++++++++++
 docker/deploy-images.sh                       |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 docker/cdt-infra-plus-node/Readme.md
 create mode 100644 docker/cdt-infra-plus-node/ubuntu-18.04/Dockerfile

diff --git a/docker/build-images.sh b/docker/build-images.sh
index bb299e00039..8cff8b57092 100755
--- a/docker/build-images.sh
+++ b/docker/build-images.sh
@@ -15,3 +15,4 @@ docker build --rm -f cdt-infra-all-gdbs/ubuntu-18.04/Dockerfile -t cdt-infra-all
 docker build --rm -f cdt-infra-eclipse-full/ubuntu-18.04/Dockerfile -t cdt-infra-eclipse-full:ubuntu-18.04 .
 docker build --rm -f cdt-infra-plus-eclipse-install/ubuntu-18.04/Dockerfile -t cdt-infra-plus-eclipse-install:ubuntu-18.04 .
 docker build --rm -f cdt-infra-plus-eclipse-install-github/ubuntu-18.04/Dockerfile -t cdt-infra-plus-eclipse-install-github:ubuntu-18.04 .
+docker build --rm -f cdt-infra-plus-node/ubuntu-18.04/Dockerfile -t cdt-infra-plus-node:ubuntu-18.04 .
\ No newline at end of file
diff --git a/docker/cdt-infra-plus-node/Readme.md b/docker/cdt-infra-plus-node/Readme.md
new file mode 100644
index 00000000000..afa255ef1e9
--- /dev/null
+++ b/docker/cdt-infra-plus-node/Readme.md
@@ -0,0 +1,2 @@
+This directory contains a convenience for the Eclipse CDT Cloud's cdt-gdb-adapter project that exists
+for historical reasons. See this reference https://github.com/eclipse-cdt-cloud/cdt-gdb-adapter/blob/main/src/integration-tests/README.md#running-the-tests-using-docker
diff --git a/docker/cdt-infra-plus-node/ubuntu-18.04/Dockerfile b/docker/cdt-infra-plus-node/ubuntu-18.04/Dockerfile
new file mode 100644
index 00000000000..922c5a22b53
--- /dev/null
+++ b/docker/cdt-infra-plus-node/ubuntu-18.04/Dockerfile
@@ -0,0 +1,21 @@
+FROM cdt-infra-eclipse-full:ubuntu-18.04
+USER root
+
+#Node
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash \
+    && apt-get install -y nodejs \
+    && rm -rf /var/lib/apt/lists/*  \
+    && npm install -g yarn
+
+# socat needed for some cdt-gdb-adapter tests
+RUN apt-get update && apt-get install -y socat && rm -rf /var/lib/apt/lists/*
+
+#Fix permissions for OpenShift & standard k8s
+RUN chown -R 1000:0 ${HOME} \
+  && chmod -R g+rwX ${HOME}
+
+ENV USER_NAME vnc
+USER 1000
+WORKDIR ${HOME}
+
+CMD ["bash"]
diff --git a/docker/deploy-images.sh b/docker/deploy-images.sh
index 69b94f16f3b..396846b9c9a 100755
--- a/docker/deploy-images.sh
+++ b/docker/deploy-images.sh
@@ -11,7 +11,7 @@ namespace=${1:-quay.io/eclipse-cdt}
 shorthash=$(git rev-parse --short HEAD)
 toplevel=$(git rev-parse --show-toplevel)
 
-images="cdt-infra-eclipse-full:ubuntu-18.04 cdt-infra-plus-eclipse-install:ubuntu-18.04 cdt-infra-plus-eclipse-install-github:ubuntu-18.04"
+images="cdt-infra-eclipse-full:ubuntu-18.04 cdt-infra-plus-eclipse-install:ubuntu-18.04 cdt-infra-plus-eclipse-install-github:ubuntu-18.04 cdt-infra-plus-node:ubuntu-18.04"
 
 $toplevel/docker/build-images.sh