Skip to content

Commit 7f464e1

Browse files
nschonninschonni
authored
Merge pull request #1725 from SimenB/rollback-changes
fix: rollback changes to v16 and 17
2 parents 89c62ed + fa12fbd commit 7f464e1

File tree

16 files changed

+16
-32
lines changed

16 files changed

+16
-32
lines changed

‎16/alpine3.14/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
4141
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
4242
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
4343
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
44-
61FC681DFB92A079F1685E77973F295594EC4689 \
4544
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4645
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
4746
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
7372
&& node --version \
7473
&& npm --version
7574

76-
ENV YARN_VERSION 1.22.19
75+
ENV YARN_VERSION 1.22.18
7776

7877
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7978
&& for key in \

‎16/alpine3.15/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
4141
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
4242
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
4343
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
44-
61FC681DFB92A079F1685E77973F295594EC4689 \
4544
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4645
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
4746
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
7372
&& node --version \
7473
&& npm --version
7574

76-
ENV YARN_VERSION 1.22.19
75+
ENV YARN_VERSION 1.22.18
7776

7877
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7978
&& for key in \

‎16/bullseye-slim/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2525
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2626
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2727
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
28-
61FC681DFB92A079F1685E77973F295594EC4689 \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
3029
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
3130
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5756
&& node --version \
5857
&& npm --version
5958

60-
ENV YARN_VERSION 1.22.19
59+
ENV YARN_VERSION 1.22.18
6160

6261
RUN set -ex \
6362
&& savedAptMark="$(apt-mark showmanual)" \

‎16/bullseye/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2424
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2525
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26-
61FC681DFB92A079F1685E77973F295594EC4689 \
2726
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2827
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2928
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4645
&& node --version \
4746
&& npm --version
4847

49-
ENV YARN_VERSION 1.22.19
48+
ENV YARN_VERSION 1.22.18
5049

5150
RUN set -ex \
5251
&& for key in \

‎16/buster-slim/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2525
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2626
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2727
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
28-
61FC681DFB92A079F1685E77973F295594EC4689 \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
3029
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
3130
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5756
&& node --version \
5857
&& npm --version
5958

60-
ENV YARN_VERSION 1.22.19
59+
ENV YARN_VERSION 1.22.18
6160

6261
RUN set -ex \
6362
&& savedAptMark="$(apt-mark showmanual)" \

‎16/buster/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2424
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2525
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26-
61FC681DFB92A079F1685E77973F295594EC4689 \
2726
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2827
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2928
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4645
&& node --version \
4746
&& npm --version
4847

49-
ENV YARN_VERSION 1.22.19
48+
ENV YARN_VERSION 1.22.18
5049

5150
RUN set -ex \
5251
&& for key in \

‎16/stretch-slim/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2525
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2626
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2727
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
28-
61FC681DFB92A079F1685E77973F295594EC4689 \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
3029
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
3130
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5756
&& node --version \
5857
&& npm --version
5958

60-
ENV YARN_VERSION 1.22.19
59+
ENV YARN_VERSION 1.22.18
6160

6261
RUN set -ex \
6362
&& savedAptMark="$(apt-mark showmanual)" \

‎16/stretch/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2323
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
2424
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
2525
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26-
61FC681DFB92A079F1685E77973F295594EC4689 \
2726
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2827
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2928
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4645
&& node --version \
4746
&& npm --version
4847

49-
ENV YARN_VERSION 1.22.19
48+
ENV YARN_VERSION 1.22.18
5049

5150
RUN set -ex \
5251
&& for key in \

‎17/alpine3.14/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
4141
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
4242
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
4343
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
44-
61FC681DFB92A079F1685E77973F295594EC4689 \
4544
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4645
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
4746
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
7372
&& node --version \
7473
&& npm --version
7574

76-
ENV YARN_VERSION 1.22.19
75+
ENV YARN_VERSION 1.22.18
7776

7877
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7978
&& for key in \

‎17/alpine3.15/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \
4141
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
4242
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
4343
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
44-
61FC681DFB92A079F1685E77973F295594EC4689 \
4544
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4645
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
4746
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
@@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \
7372
&& node --version \
7473
&& npm --version
7574

76-
ENV YARN_VERSION 1.22.19
75+
ENV YARN_VERSION 1.22.18
7776

7877
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7978
&& for key in \

0 commit comments

Comments
 (0)