Merge pull request nodejs#1725 from SimenB/rollback-changes

fix: rollback changes to v16 and 17
zZHorizonZz · May 18, 2022 · 7f464e1 · 7f464e1
2 parents 89c62ed + fa12fbd
commit 7f464e1
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 32 deletions.
diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \

diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \

diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \

diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \

diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \

diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \

diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \

diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \

diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \

diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       74F12602B6F1C4E913FAA37AD3A89613643B6201 \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      61FC681DFB92A079F1685E77973F295594EC4689 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && node --version \
     && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && savedAptMark="$(apt-mark showmanual)" \

diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     74F12602B6F1C4E913FAA37AD3A89613643B6201 \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
     C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.19
+ENV YARN_VERSION 1.22.18
 
 RUN set -ex \
   && for key in \