Merge pull request #68 from kool-dev/node-20

fabriciojs · web-flow · commit b17eb556ae60 · 2023-10-21T23:57:25.000-03:00
Drop node 16; Add node 20/21
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        version: [16, 18]
+        version: [18, 20, 21]
         runs-on: [ubuntu-latest, buildjet-4vcpu-ubuntu-2204-arm]
     runs-on: ${{ matrix.runs-on }}
 
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [16, 18]
+        version: [18, 20, 21]
 
     steps:
       - uses: docker/login-action@v3
diff --git a/20/Dockerfile b/20/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:20-alpine
 
 ENV ASUSER= \
     UID=0 \
diff --git a/20/entrypoint b/20/entrypoint
diff --git a/20/kool-npmrc b/20/kool-npmrc
diff --git a/20/root-npmrc b/20/root-npmrc
diff --git a/21/Dockerfile b/21/Dockerfile
@@ -0,0 +1,38 @@
+FROM node:21-alpine
+
+ENV ASUSER= \
+    UID=0 \
+    ENTRYPOINT=entrypoint.node.sh
+
+WORKDIR /app
+
+RUN adduser -D -u 1337 kool && deluser --remove-home node \
+    # deps
+    && apk add --no-cache \
+        bash \
+        git \
+        shadow \
+        su-exec \
+        curl \
+        # build tools
+        g++ \
+        libpng-dev \
+        make \
+        zlib-dev \
+    && npm install -g pnpm \
+    && rm -rf rm -rf /root/.npm/* \
+    # dockerize
+    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && mv dockerize /usr/local/bin/dockerize
+
+COPY root-npmrc /root/.npmrc
+COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
+COPY entrypoint /entrypoint
+
+RUN chmod +x /entrypoint
+
+RUN mkdir -p /usr/local/lib/node_modules && chmod -R 777 /usr/local/lib/node_modules
+
+RUN npm i --location=global npm@latest
+
+ENTRYPOINT [ "/entrypoint" ]
diff --git a/21/entrypoint b/21/entrypoint
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+# Run as current user
+CURRENT_USER=${ASUSER:-${UID:-0}}
+
+if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
+    usermod -u $CURRENT_USER kool
+fi
+
+# Run entrypoint if provided
+if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
+    bash $ENTRYPOINT
+fi
+
+if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
+    exec su-exec kool "$@"
+else
+    exec "$@"
+fi
diff --git a/21/kool-npmrc b/21/kool-npmrc
@@ -0,0 +1,4 @@
+scripts-prepend-node-path=true
+package-import-method=copy
+shamefully-hoist=true
+store-dir=/home/kool/.pnpm-store
diff --git a/21/root-npmrc b/21/root-npmrc
@@ -0,0 +1,4 @@
+scripts-prepend-node-path=true
+package-import-method=copy
+shamefully-hoist=true
+store-dir=/root/.pnpm-store
diff --git a/README.md b/README.md
@@ -6,21 +6,26 @@ Minimal [Node](https://nodejs.org/en/) Docker image. It's use is intended for [k
 
 ## Available Tags
 
-### 16
-
-- [16](https://github.com/kool-dev/docker-node/blob/master/16/Dockerfile)
-
 ### 18
 
 - [18](https://github.com/kool-dev/docker-node/blob/master/18/Dockerfile)
 
+### 20
+
+- [20](https://github.com/kool-dev/docker-node/blob/master/20/Dockerfile)
+
+### 21
+
+- [21](https://github.com/kool-dev/docker-node/blob/master/21/Dockerfile)
+
 ### Legacy tags
 
 The following images have been discontinued, but still exist on Hub Docker in case you need them. We strongly advise moving to the newer versions.
 
 - [10](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10/Dockerfile), [10-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10-qa/Dockerfile), [10-adonis](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10-adonis/Dockerfile), [10-adonis-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10-adonis-qa/Dockerfile), [10-nest](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10-nest/Dockerfile), [10-nest-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/10-nest-qa/Dockerfile)
 - [12](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12/Dockerfile), [12-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-qa/Dockerfile), [12-adonis](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-adonis/Dockerfile), [12-adonis-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-adonis-qa/Dockerfile), [12-nest](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-nest/Dockerfile), [12-nest-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-nest-qa/Dockerfile)
 - [14](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14/Dockerfile), [14-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-qa/Dockerfile), [14-adonis](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-adonis/Dockerfile), [14-adonis-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-adonis-qa/Dockerfile), [14-nest](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-nest/Dockerfile), [14-nest-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-nest-qa/Dockerfile)
+- [16](https://github.com/kool-dev/docker-node/blob/master/16/Dockerfile)
 
 ## Environment Variables
 
diff --git a/fwd-template.json b/fwd-template.json
@@ -2,10 +2,10 @@
     "output": ".",
     "builds": [
         {
-            "name": "16",
+            "name": "18",
             "data": {
-                "from": "node:16-alpine",
-                "version": "16"
+                "from": "node:18-alpine",
+                "version": "18"
             },
             "files": [
                 {
@@ -27,10 +27,35 @@
             ]
         },
         {
-            "name": "18",
+            "name": "20",
             "data": {
-                "from": "node:18-alpine",
-                "version": "18"
+                "from": "node:20-alpine",
+                "version": "20"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                },
+                {
+                    "name": "entrypoint",
+                    "path": "template/entrypoint"
+                },
+                {
+                    "name": "kool-npmrc",
+                    "path": "template/kool-npmrc"
+                },
+                {
+                    "name": "root-npmrc",
+                    "path": "template/root-npmrc"
+                }
+            ]
+        },
+        {
+            "name": "21",
+            "data": {
+                "from": "node:21-alpine",
+                "version": "21"
             },
             "files": [
                 {
diff --git a/kool.yml b/kool.yml
@@ -3,7 +3,9 @@ scripts:
   build:
     # parse templates
     - kool run template
-    # node 16
-    - docker build --pull -t kooldev/node:16 16
     # node 18
     - docker build --pull -t kooldev/node:18 18
+    # node 20
+    - docker build --pull -t kooldev/node:20 20
+    # node 21
+    - docker build --pull -t kooldev/node:21 21

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:16-alpine`
	`1`	`+FROM node:20-alpine`
`2`	`2`
`3`	`3`	`ENV ASUSER= \`
`4`	`4`	`UID=0 \`