From 4d4de505b98b2aa5aca405d84407ad35546f22d4 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 17 Nov 2022 22:12:51 +0100
Subject: [PATCH] Add back node js installation in chip-build image (#23667)

* Add back node js installation in chip-build image

* Add terminating newline to dockerfile

* Restyle
---
 .../docker/images/chip-build/Dockerfile       | 20 +++++++++++++++++++
 integrations/docker/images/chip-build/version |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/chip-build/Dockerfile
index 6ecb84359ff118..606c0779c9c5f4 100644
--- a/integrations/docker/images/chip-build/Dockerfile
+++ b/integrations/docker/images/chip-build/Dockerfile
@@ -148,3 +148,23 @@ RUN set -x \
     && rm zap \
     && ln -s /opt/zap-${ZAP_VERSION}/zap-cli /usr/bin/ \
     && : # last line
+
+# NodeJS: install a newer version than what apt-get would read
+# This installs the latest LTS version of nodejs
+#
+# NodeJS is required by github actions, we use Wandalen/wretry.action@v1.0.36
+# and that seems to use the built-in node installation in the image
+#
+# This is not a CHIP dependency directly, but used by CI
+ENV CHIP_NODE_VERSION=v16.13.2
+RUN set -x \
+    && mkdir node_js \
+    && cd node_js \
+    && wget https://nodejs.org/dist/$CHIP_NODE_VERSION/node-$CHIP_NODE_VERSION-linux-x64.tar.xz \
+    && tar xfvJ node-$CHIP_NODE_VERSION-linux-x64.tar.xz \
+    && mv node-$CHIP_NODE_VERSION-linux-x64 /opt/ \
+    && ln -s /opt/node-$CHIP_NODE_VERSION-linux-x64 /opt/node \
+    && ln -s /opt/node/bin/* /usr/bin \
+    && cd .. \
+    && rm -rf node_js \
+    && : # last line
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 7ab8f4209d3d23..9c82e92de70a7c 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.6.10 Version bump reason: Fix zap link (link zap-cli into /usr/bin instead of zap)
+0.6.11 Version bump reason: install nodejs into chip-build image, since github js actions seem to need it.