From 63b1fa17ce8a64261c1a5394e685caa6e083da58 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 16 Mar 2018 00:04:13 +0800 Subject: [PATCH] Fix yarn directory creation step, cc #639 --- Dockerfile-alpine.template | 1 + Dockerfile-slim.template | 1 + Dockerfile-stretch.template | 1 + Dockerfile-wheezy.template | 1 + Dockerfile.template | 1 + 5 files changed, 5 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4422fa47..6a548d6f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,6 +58,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ae0793b9..c81963f8 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -58,6 +58,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 6f19543b..42bb17de 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -53,6 +53,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 42b6bbfa..503946c9 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -49,6 +49,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile.template b/Dockerfile.template index d738b502..91bf8413 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -53,6 +53,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \