Add Node debian core variant

nodejs · Apr 3, 2024 · ff1c9e5 · ff1c9e5
1 parent d2df053
commit ff1c9e5
Show file tree

Hide file tree

Showing 27 changed files with 318 additions and 9 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,4 @@
 * text=auto eol=lf
+/*/**/Dockerfile            linguist-generated
+/*/**/docker-entrypoint.sh  linguist-generated
+/Dockerfile*.template        linguist-language=Dockerfile
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -68,6 +68,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Build core base image
+        if: ${{ endsWith(matrix.variant, '-core') }}
+        uses: docker/build-push-action@v5
+        with:
+          push: false
+          load: true
+          context: .
+          file: ./${{ steps.short-version.outputs.result }}/${{ matrix.base }}/Dockerfile
+          tags: node:${{ matrix.version }}-${{ matrix.base }}
+
       - name: Build image
         uses: docker/build-push-action@v5
         with:
@@ -91,7 +101,9 @@ jobs:
           [ "${output}" = 'success' ]
 
       - name: Test for npm
+        if: ${{ ! endsWith(matrix.variant, '-core') }}
         run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version
 
       - name: Test for yarn
+        if: ${{ ! endsWith(matrix.variant, '-core') }}
         run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} yarn --version
diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile
diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile
diff --git a/18/bookworm-core/Dockerfile b/18/bookworm-core/Dockerfile
diff --git a/18/bookworm-core/docker-entrypoint.sh b/18/bookworm-core/docker-entrypoint.sh
diff --git a/18/bullseye-core/Dockerfile b/18/bullseye-core/Dockerfile
diff --git a/18/bullseye-core/docker-entrypoint.sh b/18/bullseye-core/docker-entrypoint.sh
diff --git a/18/buster-core/Dockerfile b/18/buster-core/Dockerfile
diff --git a/18/buster-core/docker-entrypoint.sh b/18/buster-core/docker-entrypoint.sh
diff --git a/20/bookworm-core/Dockerfile b/20/bookworm-core/Dockerfile
diff --git a/20/bookworm-core/docker-entrypoint.sh b/20/bookworm-core/docker-entrypoint.sh
diff --git a/20/bullseye-core/Dockerfile b/20/bullseye-core/Dockerfile
diff --git a/20/bullseye-core/docker-entrypoint.sh b/20/bullseye-core/docker-entrypoint.sh
diff --git a/20/buster-core/Dockerfile b/20/buster-core/Dockerfile
diff --git a/20/buster-core/docker-entrypoint.sh b/20/buster-core/docker-entrypoint.sh
diff --git a/21/bookworm-core/Dockerfile b/21/bookworm-core/Dockerfile
diff --git a/21/bookworm-core/docker-entrypoint.sh b/21/bookworm-core/docker-entrypoint.sh
diff --git a/21/bullseye-core/Dockerfile b/21/bullseye-core/Dockerfile
diff --git a/21/bullseye-core/docker-entrypoint.sh b/21/bullseye-core/docker-entrypoint.sh
diff --git a/Dockerfile-debian-core.template b/Dockerfile-debian-core.template
@@ -0,0 +1,13 @@
+FROM debian:name-slim
+
+RUN groupadd --gid 1000 node \
+  && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
+
+ENV NODE_VERSION 0.0.0
+
+COPY --from=node:0.0.0-slim --link /usr/local/bin/ /usr/local/bin/
+COPY --from=node:0.0.0-slim --link /usr/local/include/node/ /usr/local/include/node/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD [ "node" ]
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ The official Node.js docker image, made with love by the node community.
   - [`node:bullseye`](#nodebullseye)
   - [`node:bookworm`](#nodebookworm)
   - [`node:slim`](#nodeslim)
+  - [`node:core`](#nodecore)
 - [License](#license)
 - [Supported Docker versions](#supported-docker-versions)
 - [Supported Node.js versions](#supported-nodejs-versions)
@@ -223,6 +224,10 @@ in an environment where *only* the Node.js image will be deployed and you have
 space constraints, we highly recommend using the default image of this
 repository.
 
+### `node:core`
+
+This image is a variant of the slim image without npm or Yarn.
+
 ## License
 
 [License information](https://github.com/nodejs/node/blob/master/LICENSE) for

diff --git a/architectures b/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch  variants
-amd64          alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim
+amd64          alpine3.18,alpine3.19,bookworm,bookworm-slim,bookworm-core,bullseye,bullseye-slim,bullseye-core,buster,buster-slim,buster-core
 arm32v6        alpine3.18,alpine3.19
-arm32v7        alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim
-arm64v8        alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim
+arm32v7        alpine3.18,alpine3.19,bookworm,bookworm-slim,bookworm-core,bullseye,bullseye-slim,bullseye-core,buster,buster-slim,buster-core
+arm64v8        alpine3.18,alpine3.19,bookworm,bookworm-slim,bookworm-core,bullseye,bullseye-slim,bullseye-core,buster,buster-slim,buster-core
 i386           alpine3.18,alpine3.19
-ppc64le        alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim
-s390x          alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim
+ppc64le        alpine3.18,alpine3.19,bookworm,bookworm-slim,bookworm-core,bullseye,bullseye-slim,bullseye-core,buster,buster-slim,buster-core
+s390x          alpine3.18,alpine3.19,bookworm,bookworm-slim,bookworm-core,bullseye,bullseye-slim,bullseye-core,buster,buster-slim,buster-core
diff --git a/functions.sh b/functions.sh
@@ -193,6 +193,20 @@ function is_debian_slim() {
   return 1
 }
 
+function is_debian_core() {
+  local variant
+  variant=$1
+  shift
+
+  IFS=' ' read -ra debianVersions <<< "$(get_config "./" "debian_versions")"
+  for d in "${debianVersions[@]}"; do
+    if [ "${d}-core" = "${variant}" ]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
 function get_fork_name() {
   local version
   version=$1

diff --git a/genMatrix.js b/genMatrix.js
@@ -60,6 +60,17 @@ const getDockerfileMatrixEntry = (file) => {
 
   const version = getFullNodeVersionFromDockerfile(file);
 
+  // Specify the base image that needs to be built before the core one
+  if (variant.endsWith('-core')) {
+    const base = variant.replace('-core', '-slim')
+
+    return {
+      version,
+      variant,
+      base,
+    }
+  }
+
   return {
     version,
     variant,