From 90509869aa38a6bfda1ef08e05641c4c0eb6f1de Mon Sep 17 00:00:00 2001 From: damiankoper Date: Tue, 27 Oct 2020 20:05:54 +0100 Subject: [PATCH] feat: default shell for alpine images --- 10/alpine3.10/Dockerfile | 2 ++ 10/alpine3.11/Dockerfile | 2 ++ 10/alpine3.9/Dockerfile | 2 ++ 12/alpine3.10/Dockerfile | 2 ++ 12/alpine3.11/Dockerfile | 2 ++ 12/alpine3.12/Dockerfile | 2 ++ 12/alpine3.9/Dockerfile | 2 ++ 14/alpine3.10/Dockerfile | 2 ++ 14/alpine3.11/Dockerfile | 2 ++ 14/alpine3.12/Dockerfile | 2 ++ 15/alpine3.10/Dockerfile | 2 ++ 15/alpine3.11/Dockerfile | 2 ++ 15/alpine3.12/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ 14 files changed, 28 insertions(+) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index ebad2ff46..97d93fea2 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -67,6 +67,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 diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index b6472e409..3c1612925 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -67,6 +67,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 diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 8cdfc9799..1ca8141b3 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -67,6 +67,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 diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index e5a1b795b..2ed853765 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -67,6 +67,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 diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 800779610..dba7df39a 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -67,6 +67,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 diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index f56baf3a4..6ab9cdc4b 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -67,6 +67,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 diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 2bad54383..304a633aa 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -67,6 +67,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 diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index e8f902df2..9a455da6f 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -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 diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 3d5fce68b..64c7db18f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -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 diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index ba9364d49..ccb6c478c 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -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 diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 82555bbbe..b2e93dc0e 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -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 diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 0ffcc5fee..827c1b4e5 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -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 diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index f07389792..8ee096793 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -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 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index f5c4c949f..7197f2249 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -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