Skip to content

Commit f6fb099

Browse files
damiankoperdamiankoper
committed
feat: default shell for alpine images
1 parent 4b70c53 commit f6fb099

File tree

22 files changed

+50
-7
lines changed

22 files changed

+50
-7
lines changed

‎10/alpine3.10/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version
7376

74-
ENV YARN_VERSION 1.22.4
77+
ENV YARN_VERSION 1.22.5
7578

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

‎10/alpine3.11/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version
7376

74-
ENV YARN_VERSION 1.22.4
77+
ENV YARN_VERSION 1.22.5
7578

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

‎10/alpine3.9/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version
7376

74-
ENV YARN_VERSION 1.22.4
77+
ENV YARN_VERSION 1.22.5
7578

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

‎10/buster-slim/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2222
&& for key in \
2323
4ED778F539E3634C779C87C6D7062848A1AB005C \
2424
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
25+
1C050899334244A8AF75E53792EF661D867B9DFA \
2526
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
2627
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2728
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5556
&& node --version \
5657
&& npm --version
5758

58-
ENV YARN_VERSION 1.22.4
59+
ENV YARN_VERSION 1.22.5
5960

6061
RUN set -ex \
6162
&& savedAptMark="$(apt-mark showmanual)" \

‎10/buster/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2020
&& for key in \
2121
4ED778F539E3634C779C87C6D7062848A1AB005C \
2222
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
23+
1C050899334244A8AF75E53792EF661D867B9DFA \
2324
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
2425
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2526
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4445
&& node --version \
4546
&& npm --version
4647

47-
ENV YARN_VERSION 1.22.4
48+
ENV YARN_VERSION 1.22.5
4849

4950
RUN set -ex \
5051
&& for key in \

‎10/stretch-slim/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2222
&& for key in \
2323
4ED778F539E3634C779C87C6D7062848A1AB005C \
2424
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
25+
1C050899334244A8AF75E53792EF661D867B9DFA \
2526
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
2627
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2728
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5556
&& node --version \
5657
&& npm --version
5758

58-
ENV YARN_VERSION 1.22.4
59+
ENV YARN_VERSION 1.22.5
5960

6061
RUN set -ex \
6162
&& savedAptMark="$(apt-mark showmanual)" \

‎10/stretch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2020
&& for key in \
2121
4ED778F539E3634C779C87C6D7062848A1AB005C \
2222
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
23+
1C050899334244A8AF75E53792EF661D867B9DFA \
2324
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
2425
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
2526
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4445
&& node --version \
4546
&& npm --version
4647

47-
ENV YARN_VERSION 1.22.4
48+
ENV YARN_VERSION 1.22.5
4849

4950
RUN set -ex \
5051
&& for key in \

‎12/alpine3.10/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version

‎12/alpine3.11/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version

‎12/alpine3.12/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
3838
&& for key in \
3939
4ED778F539E3634C779C87C6D7062848A1AB005C \
4040
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
41+
1C050899334244A8AF75E53792EF661D867B9DFA \
4142
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
4243
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
4344
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
@@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
6768
fi \
6869
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
6970
&& apk del .build-deps \
71+
&& npm config set shell sh \
72+
&& npm config set script-shell sh \
7073
# smoke tests
7174
&& node --version \
7275
&& npm --version

0 commit comments

Comments
 (0)