Merge pull request #2416 from nschonni/yarn-cleanup

feat: in-line Yarn data to templates

Author: nschonni

CONTRIBUTING.md

@@ -27,7 +27,7 @@ New **Node.js** releases are released as soon as possible.
 
 New **npm** releases are not tracked. We simply use the npm version bundled in the corresponding Node.js release.
 
-**Yarn** is updated to the latest version only when there is a new Node.js SemVer PATCH release (unless Yarn has received a security update), and it's updated only in the branch with the new release, preferably in the same PR. The `update.sh` script does this automatically when invoked with a specific branch, e.g. `./update.sh 6.10`.
+**[Yarn v1 Classic](https://classic.yarnpkg.com/)** is no longer maintained upstream, and will be removed starting with the Node 26 images.
 
 ### Submitting a PR for a version update
 

Dockerfile-alpine.template

@@ -71,13 +71,13 @@ RUN addgroup -g 1000 node \
   && npm --version \
   && rm -rf /tmp/*
 
-ENV YARN_VERSION=0.0.0
+ENV YARN_VERSION=1.22.22
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
   && export GNUPGHOME="$(mktemp -d)" \
   && for key in \
-    "${YARN_KEYS[@]}"
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
     { gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
     { gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \

Dockerfile-debian.template

@@ -39,13 +39,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && npm --version \
   && rm -rf /tmp/*
 
-ENV YARN_VERSION=0.0.0
+ENV YARN_VERSION=1.22.22
 
 RUN set -ex \
   # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
   && export GNUPGHOME="$(mktemp -d)" \
   && for key in \
-    "${YARN_KEYS[@]}"
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
     { gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
     { gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \

Dockerfile-slim.template

@@ -53,7 +53,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && npm --version \
     && rm -rf /tmp/*
 
-ENV YARN_VERSION=0.0.0
+ENV YARN_VERSION=1.22.22
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \
@@ -62,7 +62,7 @@ RUN set -ex \
   # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
   && export GNUPGHOME="$(mktemp -d)" \
   && for key in \
-    "${YARN_KEYS[@]}"
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
     { gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
     { gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \

keys/yarn.keys

@@ -12,25 +12,23 @@ function usage() {
 
   Examples:
     - update.sh                      # Update all images
-    - update.sh -s                   # Update all images, skip updating Alpine and Yarn
+    - update.sh -s                   # Update all images, skip updating Alpine
     - update.sh 8,10                 # Update all variants of version 8 and 10
-    - update.sh -s 8                 # Update version 8 and variants, skip updating Alpine and Yarn
+    - update.sh -s 8                 # Update version 8 and variants, skip updating Alpine
     - update.sh 8 alpine             # Update only alpine's variants for version 8
-    - update.sh -s 8 bullseye        # Update only bullseye variant for version 8, skip updating Alpine and Yarn
+    - update.sh -s 8 bullseye        # Update only bullseye variant for version 8, skip updating Alpine
     - update.sh . alpine             # Update the alpine variant for all versions
 
   OPTIONS:
-    -s Security update; skip updating the yarn and alpine versions.
+    -s Security update; skip updating the Alpine versions.
     -h Show this message
 
 EOF
 }
 
-SKIP=false
 while getopts "sh" opt; do
   case "${opt}" in
     s)
-      SKIP=true
       shift
       ;;
     h)
@@ -64,10 +62,6 @@ fi
 # TODO: Should be able to specify target architecture manually
 arch=$(get_arch)
 
-if [ "${SKIP}" != true ]; then
-  yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)"
-fi
-
 function in_versions_to_update() {
   local version=$1
 
@@ -138,13 +132,11 @@ function update_node_version() {
 '
 
     # Add GPG keys
-    for key_type in "node" "yarn"; do
-      while read -r line; do
-        pattern='"\$\{'$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')'_KEYS\[@\]\}"'
-        sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}-tmp"
-      done < "keys/${key_type}.keys"
-      sed -Ei -e "/${pattern}/d" "${dockerfile}-tmp"
-    done
+    while read -r line; do
+      pattern='"\$\{'$(echo "node" | tr '[:lower:]' '[:upper:]')'_KEYS\[@\]\}"'
+      sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}-tmp"
+    done < "keys/node.keys"
+    sed -Ei -e "/${pattern}/d" "${dockerfile}-tmp"
 
     if is_alpine "${variant}"; then
       alpine_version="${variant#*alpine}"
@@ -167,9 +159,6 @@ function update_node_version() {
     if diff -q "${dockerfile}-tmp" "${dockerfile}" > /dev/null; then
       echo "${dockerfile} is already up to date!"
     else
-      if [ "${SKIP}" != true ]; then
-        sed -Ei -e 's/^(ENV YARN_VERSION)=.*/\1='"${yarnVersion}"'/' "${dockerfile}-tmp"
-      fi
       echo "${dockerfile} updated!"
     fi