Skip to content

Commit

Permalink
feat: default shell for alpine images
Browse files Browse the repository at this point in the history
  • Loading branch information
@damiankoper
damiankoper committed Oct 26, 2020
1 parent 4b70c53 commit f6fb099
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 7 deletions.
5 changes: 4 additions & 1 deletion 10/alpine3.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
&& for key in \
Expand Down
5 changes: 4 additions & 1 deletion 10/alpine3.11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
&& for key in \
Expand Down
5 changes: 4 additions & 1 deletion 10/alpine3.9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,11 +68,13 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
&& for key in \
Expand Down
3 changes: 2 additions & 1 deletion 10/buster-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand Down
3 changes: 2 additions & 1 deletion 10/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand All @@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN set -ex \
&& for key in \
Expand Down
3 changes: 2 additions & 1 deletion 10/stretch-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand Down
3 changes: 2 additions & 1 deletion 10/stretch/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand All @@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& node --version \
&& npm --version

ENV YARN_VERSION 1.22.4
ENV YARN_VERSION 1.22.5

RUN set -ex \
&& for key in \
Expand Down
3 changes: 3 additions & 0 deletions 12/alpine3.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
3 changes: 3 additions & 0 deletions 12/alpine3.11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
3 changes: 3 additions & 0 deletions 12/alpine3.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
3 changes: 3 additions & 0 deletions 12/alpine3.9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down Expand Up @@ -67,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
1 change: 1 addition & 0 deletions 12/buster-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down
1 change: 1 addition & 0 deletions 12/buster/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down
1 change: 1 addition & 0 deletions 12/stretch-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down
1 change: 1 addition & 0 deletions 12/stretch/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1C050899334244A8AF75E53792EF661D867B9DFA \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
Expand Down
2 changes: 2 additions & 0 deletions 14/alpine3.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions 14/alpine3.11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions 14/alpine3.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions 15/alpine3.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions 15/alpine3.11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions 15/alpine3.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ RUN addgroup -g 1000 node \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
&& npm config set shell sh \
&& npm config set script-shell sh \
# smoke tests
&& node --version \
&& npm --version
Expand Down

0 comments on commit f6fb099

Please sign in to comment.