From 140ff2d985876084a510a16031e19fb68178f500 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 13 Feb 2024 12:08:25 +0000
Subject: [PATCH] Use node:20-slim as the base for consistency with app images.

---
 hosting/couchdb/Dockerfile |  2 +-
 hosting/single/Dockerfile  | 10 +++-------
 scripts/install-node.sh    |  8 --------
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 scripts/install-node.sh

diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile
index 6f940d6c48..b4dbdd36dc 100644
--- a/hosting/couchdb/Dockerfile
+++ b/hosting/couchdb/Dockerfile
@@ -1,5 +1,5 @@
 # Modified from https://github.com/apache/couchdb-docker/blob/main/3.2.1/Dockerfile
-FROM debian:bookworm-slim
+FROM node:20-slim
 
 # Add CouchDB user account to make sure the IDs are assigned consistently
 RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb
diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index f9044cd124..a928766541 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -3,7 +3,6 @@ FROM node:20-slim as build
 # install node-gyp dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends g++ make python3 jq
 
-
 # copy and install dependencies
 WORKDIR /app
 COPY package.json .
@@ -39,10 +38,9 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 COPY packages/string-templates packages/string-templates
 
 
-FROM budibase/couchdb as runner
+FROM budicouch as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
-ENV NODE_MAJOR 20
 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)
 # e.g. docker build --build-arg TARGETBUILD=aas ....
 ARG TARGETBUILD=single
@@ -60,10 +58,8 @@ RUN apt install -y software-properties-common apt-transport-https ca-certificate
     && apt install postgresql-client-15 -y \
     && apt remove software-properties-common apt-transport-https gpg -y
 
-# install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx
-WORKDIR /nodejs
-COPY scripts/install-node.sh ./install.sh
-RUN chmod +x install.sh && ./install.sh
+# We use pm2 in order to run multiple node processes in a single container
+RUN npm install --global pm2
 
 # setup nginx
 COPY hosting/single/nginx/nginx.conf /etc/nginx
diff --git a/scripts/install-node.sh b/scripts/install-node.sh
deleted file mode 100644
index 562bdf2cd3..0000000000
--- a/scripts/install-node.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-apt-get install -y gnupg
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor | tee /usr/share/keyrings/nodesource.gpg > /dev/null
-echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-apt-get update
-echo "INSTALLING NODE $NODE_MAJOR"
-apt-get install -y --no-install-recommends nodejs
-npm install --global yarn pm2
\ No newline at end of file