From 7bbf7a0e9972e429d82e85f94b3f15a4546b549d Mon Sep 17 00:00:00 2001 From: Teoh Han Hui Date: Thu, 13 Apr 2017 13:24:56 +0800 Subject: [PATCH] Add global node-gyp for yarn --- 4.8/Dockerfile | 4 +++- 4.8/alpine/Dockerfile | 2 ++ 4.8/slim/Dockerfile | 4 +++- 4.8/wheezy/Dockerfile | 4 +++- 6.10/Dockerfile | 4 +++- 6.10/alpine/Dockerfile | 2 ++ 6.10/slim/Dockerfile | 4 +++- 6.10/wheezy/Dockerfile | 4 +++- 7.9/Dockerfile | 4 +++- 7.9/alpine/Dockerfile | 2 ++ 7.9/slim/Dockerfile | 4 +++- 7.9/wheezy/Dockerfile | 4 +++- Dockerfile-alpine.template | 2 ++ Dockerfile-slim.template | 4 +++- Dockerfile-wheezy.template | 4 +++- Dockerfile.template | 4 +++- 16 files changed, 44 insertions(+), 12 deletions(-) diff --git a/4.8/Dockerfile b/4.8/Dockerfile index e9fc439bff..f6c3b397aa 100644 --- a/4.8/Dockerfile +++ b/4.8/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/4.8/alpine/Dockerfile b/4.8/alpine/Dockerfile index b88d3ce28b..b6a712c80e 100644 --- a/4.8/alpine/Dockerfile +++ b/4.8/alpine/Dockerfile @@ -62,6 +62,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp \ && apk del .build-deps-yarn CMD [ "node" ] diff --git a/4.8/slim/Dockerfile b/4.8/slim/Dockerfile index 1caf08b27e..a0dbeaf44a 100644 --- a/4.8/slim/Dockerfile +++ b/4.8/slim/Dockerfile @@ -51,6 +51,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/4.8/wheezy/Dockerfile b/4.8/wheezy/Dockerfile index 8f74a2bef3..f671910286 100644 --- a/4.8/wheezy/Dockerfile +++ b/4.8/wheezy/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/6.10/Dockerfile b/6.10/Dockerfile index dcd6bc71ba..92d97a4fdb 100644 --- a/6.10/Dockerfile +++ b/6.10/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/6.10/alpine/Dockerfile b/6.10/alpine/Dockerfile index e6968ff8ed..63ad378815 100644 --- a/6.10/alpine/Dockerfile +++ b/6.10/alpine/Dockerfile @@ -62,6 +62,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp \ && apk del .build-deps-yarn CMD [ "node" ] diff --git a/6.10/slim/Dockerfile b/6.10/slim/Dockerfile index 6687b73888..5de1af484d 100644 --- a/6.10/slim/Dockerfile +++ b/6.10/slim/Dockerfile @@ -51,6 +51,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/6.10/wheezy/Dockerfile b/6.10/wheezy/Dockerfile index 4e88778e9b..45306dafd7 100644 --- a/6.10/wheezy/Dockerfile +++ b/6.10/wheezy/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/7.9/Dockerfile b/7.9/Dockerfile index 7e81bcb623..a83c2115c2 100644 --- a/7.9/Dockerfile +++ b/7.9/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/7.9/alpine/Dockerfile b/7.9/alpine/Dockerfile index faeb8d7244..12bc2798e7 100644 --- a/7.9/alpine/Dockerfile +++ b/7.9/alpine/Dockerfile @@ -62,6 +62,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp \ && apk del .build-deps-yarn CMD [ "node" ] diff --git a/7.9/slim/Dockerfile b/7.9/slim/Dockerfile index bea98ecad4..67ecfe35c4 100644 --- a/7.9/slim/Dockerfile +++ b/7.9/slim/Dockerfile @@ -51,6 +51,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/7.9/wheezy/Dockerfile b/7.9/wheezy/Dockerfile index ffd67124bd..552c55184a 100644 --- a/7.9/wheezy/Dockerfile +++ b/7.9/wheezy/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 460e89b004..2f3202a30a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -62,6 +62,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp \ && apk del .build-deps-yarn CMD [ "node" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 701956e5c3..e434e77cbc 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -51,6 +51,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index f49eb9f6be..f61310ff59 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ] diff --git a/Dockerfile.template b/Dockerfile.template index 5901635d8c..f548e2e36b 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -46,6 +46,8 @@ RUN set -ex \ && gpg --batch --verify yarn.js.asc yarn.js \ && rm yarn.js.asc \ && mv yarn.js /usr/local/bin/yarn \ - && chmod +x /usr/local/bin/yarn + && chmod +x /usr/local/bin/yarn \ + # https://github.com/yarnpkg/yarn/issues/2266 + && yarn global add node-gyp CMD [ "node" ]