From b8142222e582d94eceaa6d52e9d9b60b53e2f7c2 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 16 Dec 2016 09:36:08 +0800 Subject: [PATCH] Support specific version of yarn. Signed-off-by: Bo-Yi Wu --- docker-compose.yml | 1 + workspace/Dockerfile | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d35f1cc7..77cd00fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: - PUID=1000 - PGID=1000 - NODE_VERSION=stable + - YARN_VERSION=latest - TZ=UTC volumes_from: - applications diff --git a/workspace/Dockerfile b/workspace/Dockerfile index e1782b20..36605146 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -189,10 +189,16 @@ USER laradock ARG INSTALL_YARN=false ENV INSTALL_YARN ${INSTALL_YARN} +ARG YARN_VERSION=latest +ENV YARN_VERSION ${YARN_VERSION} RUN if [ ${INSTALL_YARN} = true ]; then \ [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \ - curl -o- -L https://yarnpkg.com/install.sh | bash && \ + if [ ${YARN_VERSION} = "latest" ]; then \ + curl -o- -L https://yarnpkg.com/install.sh | bash; \ + else \ + curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION}; \ + fi && \ echo "" >> ~/.bashrc && \ echo 'export PATH="$HOME/.yarn/bin:$PATH"' >> ~/.bashrc \ ;fi