From 5da58d1f180a6444110740656f625a87fe2d52c1 Mon Sep 17 00:00:00 2001
From: Philipp Kunz <gitlab@philkunz.com>
Date: Tue, 11 Oct 2022 10:42:42 +0200
Subject: [PATCH] fix(core): update

---
 Dockerfile            | 18 ++++++++++++++++--
 Dockerfile_alpine     |  6 ++++++
 Dockerfile_iot        |  2 +-
 Dockerfile_npmci      |  2 +-
 Dockerfile_stable     | 13 -------------
 Dockerfile_stableinit |  2 +-
 6 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 Dockerfile_stable

diff --git a/Dockerfile b/Dockerfile
index da2577f..672a5da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,5 +81,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 
 # Install nvm with node and npm
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
-RUN curl -fsSL https://get.pnpm.io/install.sh | sh - \
-    && pnpm setup
+
+RUN bash -c "source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION_STABLE \
+    && nvm alias default $NODE_VERSION_STABLE \
+    && nvm use default \
+    && npm config set unsafe-perm true \
+    && npm install -g agentkeepalive \
+    && npm install -g npm"
+
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
+ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH
+
+ENV PNPM_HOME="/root/.local/share/pnpm/pnpm"
+RUN mkdir -p ${PNPM_HOME}
+ENV PATH="$PNPM_HOME:$PATH"
+RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm && pnpm -v
diff --git a/Dockerfile_alpine b/Dockerfile_alpine
index efe6fbe..fb0378e 100644
--- a/Dockerfile_alpine
+++ b/Dockerfile_alpine
@@ -5,6 +5,12 @@ ENV PYTHONUNBUFFERED=1
 RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
 RUN python3 -m ensurepip
 RUN pip3 install --no-cache --upgrade pip setuptools
+
+#pnpm
+ENV PNPM_HOME="/root/.local/share/pnpm/pnpm"
+RUN mkdir -p ${PNPM_HOME}
+ENV PATH="$PNPM_HOME:$PATH"
 RUN curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; chmod +x /bin/pnpm;
+RUN pnpm -v
 
 ENV NODE_OPTIONS="--max_old_space_size=1000"
\ No newline at end of file
diff --git a/Dockerfile_iot b/Dockerfile_iot
index 450e565..ea7971e 100644
--- a/Dockerfile_iot
+++ b/Dockerfile_iot
@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable as stage1
+FROM hosttoday/ht-docker-node:latest as stage1
 LABEL author="Lossless GmbH <hello@lossless.com>"
 RUN apt-get update && apt-get install -y --no-install-recommends qemu-user-static binfmt-support
   # the following lines need to be run on a system that supports both architectures
diff --git a/Dockerfile_npmci b/Dockerfile_npmci
index 55bebcd..244c983 100644
--- a/Dockerfile_npmci
+++ b/Dockerfile_npmci
@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable
+FROM hosttoday/ht-docker-node:latest
 LABEL author="Lossless GmbH <hello@lossless.com>"
 
 RUN pnpm install -g @shipzone/npmci
diff --git a/Dockerfile_stable b/Dockerfile_stable
deleted file mode 100644
index 373667e..0000000
--- a/Dockerfile_stable
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM hosttoday/ht-docker-node:latest
-LABEL author="Lossless GmbH <hello@lossless.com>"
-
-RUN bash -c "source $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION_STABLE \
-    && nvm alias default $NODE_VERSION_STABLE \
-    && nvm use default \
-    && npm config set unsafe-perm true \
-    && npm install -g agentkeepalive \
-    && npm install -g npm"
-
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
-ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH
diff --git a/Dockerfile_stableinit b/Dockerfile_stableinit
index 216e553..bc64cf3 100644
--- a/Dockerfile_stableinit
+++ b/Dockerfile_stableinit
@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable
+FROM hosttoday/ht-docker-node:latest
 # Add Tini
 ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini