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 ebad2ff468..97d93fea2c 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 b6472e4091..3c16129254 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 8cdfc97999..1ca8141b3b 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 e5a1b795b9..2ed853765a 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 8007796104..dba7df39ae 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 f56baf3a47..6ab9cdc4b5 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 2bad543831..304a633aa1 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 e8f902df2f..9a455da6fe 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 3d5fce68bb..64c7db18f5 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 ba9364d495..ccb6c478c2 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 82555bbbe5..b2e93dc0e4 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 0ffcc5feeb..827c1b4e52 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 f07389792e..8ee096793a 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 f5c4c949f7..7197f2249f 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