Skip to content

Commit 873f31a

Browse files
committed
make npm_install work on alpine
1 parent 87c8481 commit 873f31a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

system-test/Dockerfile.node10-alpine

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ RUN go get github.com/google/pprof
66

77
FROM node:10-alpine
88

9-
ARG ADDITIONAL_PACKAGES
109

1110
RUN apk add --no-cache bash $ADDITIONAL_PACKAGES
1211
WORKDIR /root/

system-test/test.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ retry() {
66
"${@}" || "${@}" || "${@}" || return 1
77
}
88

9+
function wait_only() {
10+
if [ -f /bin/busybox ]; then
11+
timeout -t "${@}"
12+
else
13+
timeout "${@}"
14+
fi
15+
}
16+
917
npm_install() {
10-
timeout 60 npm install "${@}"
18+
wait_only 60 npm install "${@}"
1119
}
1220

1321
set -eox pipefail

0 commit comments

Comments
 (0)