chore: Remove OnBuild variant

Author: nschonni

Dockerfile-onbuild.template

@@ -23,7 +23,6 @@ The official Node.js docker image, made with love by the node community.
 - [Image Variants](#image-variants)
   - [`node:<version>`](#nodeversion)
   - [`node:alpine`](#nodealpine)
-  - [`node:onbuild`](#nodeonbuild)
   - [`node:slim`](#nodeslim)
 - [License](#license)
 - [Supported Docker versions](#supported-docker-versions)
@@ -191,49 +190,6 @@ image as a base, add the things you need in your own Dockerfile
 (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for
 examples of how to install packages if you are unfamiliar).
 
-### `node:onbuild`
-
-The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076).
-
-This image makes building derivative images easier. For most use cases, creating
-a `Dockerfile` in the base of your project directory with the line `FROM
-node:onbuild` will be enough to create a stand-alone image for your project.
-
-While the `onbuild` variant is really useful for "getting off the ground
-running" (zero to Dockerized in a short period of time), it's not recommended
-for long-term usage within a project due to the lack of control over *when* the
-`ONBUILD` triggers fire (see also
-[`docker/docker#5714`](https://github.com/docker/docker/issues/5714),
-[`docker/docker#8240`](https://github.com/docker/docker/issues/8240),
-[`docker/docker#11917`](https://github.com/docker/docker/issues/11917)).
-
-Once you've got a handle on how your project functions within Docker, you'll
-probably want to adjust your `Dockerfile` to inherit from a non-`onbuild`
-variant and copy the commands from the `onbuild` variant `Dockerfile` (moving
-the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your
-own file so that you have tighter control over them and more transparency for
-yourself and others looking at your `Dockerfile` as to what it does. This also
-makes it easier to add additional requirements as time goes on (such as
-installing more packages before performing the previously-`ONBUILD` steps).
-
-This `onbuild` variant will only install npm packages according to the
-`package.json` and *does not* adhere to the `npm-shrinkwrap.json` (see full
-discussion in
-[`nodejs/docker-node#65`](https://github.com/nodejs/docker-node/issues/65).
-
-Note that npm installs devDependencies by default, which is undesirable if
-you're building a production image. To avoid this pass NODE_ENV as a build
-argument i.e. `docker build --build-arg NODE_ENV=production …`.
-
-The image assumes that your application has a file named
-[`package.json`](https://docs.npmjs.com/files/package.json) listing its
-dependencies and defining its [start
-script](https://docs.npmjs.com/misc/scripts#default-values).
-
-It also assumes that you have a file named [`.dockerignore`](https://docs.docker.com/engine/reference/builder/#/dockerignore-file) otherwise it will copy your local npm modules:
-
-`node_modules`
-
 ### `node:slim`
 
 This image does not contain the common packages contained in the default tag and

README.md

@@ -1,8 +1,8 @@
 bashbrew-arch   variants
-amd64    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-arm32v6  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-arm32v7  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-arm64v8  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-i386     jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-ppc64le  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
-s390x    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild
+amd64    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+arm32v6  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+arm32v7  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+arm64v8  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+i386     jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+ppc64le  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11
+s390x    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11

architectures

@@ -7,8 +7,8 @@ set -euo pipefail
 . functions.sh
 
 # Convert comma delimited cli arguments to arrays
-# E.g. ./test-build.sh 8,10 slim,onbuild
-# "8,10" becomes "8 10" and "slim,onbuild" becomes "slim onbuild"
+# E.g. ./test-build.sh 10,12 slim,alpine
+# "10,12" becomes "10 12" and "slim,alpine" becomes "slim alpine"
 IFS=',' read -ra versions_arg <<< "${1:-}"
 IFS=',' read -ra variant_arg <<< "${2:-}"
 
@@ -88,11 +88,6 @@ for version in "${versions[@]}"; do
     # Skip non-docker directories
     [ -f "${version}/${variant}/Dockerfile" ] || continue
 
-    if [ "${variant}" = "onbuild" ]; then
-      build "${version}" "${default_variant}" "$tag"
-      test_image "${full_version}" "${default_variant}" "$tag"
-    fi
-
     build "${version}" "${variant}" "${tag}"
     test_image "${full_version}" "${variant}" "${tag}"
   done

test-build.sh

@@ -131,7 +131,7 @@ function update_node_version() {
   (
     cp "${template}" "${dockerfile}-tmp"
     local fromprefix=""
-    if [ "${arch}" != "amd64" ] && [ "${variant}" != "onbuild" ]; then
+    if [ "${arch}" != "amd64" ]; then
       fromprefix="${arch}\\/"
     fi
 
@@ -146,9 +146,6 @@ function update_node_version() {
     fi
     sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}-tmp"
 
-    # Only for onbuild variant
-    sed -Ei -e 's/^(FROM .*node:)[^-]*(-.*)/\1'"${nodeVersion}"'\2/' "${dockerfile}-tmp"
-
     # shellcheck disable=SC1004
     new_line=' \\\
 '
@@ -248,7 +245,7 @@ for version in "${versions[@]}"; do
       template_file="${parentpath}/Dockerfile-alpine.template"
     fi
 
-    [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"
+    cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"
     if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then
       update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" &
     fi