Update yarn per https://github.com/nodejs/docker-node/blob/master/doc…

…s/BestPractices.md#upgradingdowngrading-yarn
microsoft · Apr 19, 2019 · 5afc842 · 5afc842
1 parent 4382a6e
commit 5afc842
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 43 deletions.
diff --git a/containers/azure-functions-node-8/.devcontainer/Dockerfile b/containers/azure-functions-node-8/.devcontainer/Dockerfile
@@ -5,8 +5,8 @@
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1
 
-# Install git, process tools, bash
-RUN apt-get update && apt-get -y install git procps
+# Verify git and needed tools are installed
+RUN apt-get update && apt-get -y install git curl tar procps
 
 # Install Node.js via NVM -  See https://github.com/creationix/nvm
 # Change the number "8" in the two lines below to pick a different version
@@ -18,6 +18,14 @@ RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh
 # Install eslint
 RUN /bin/bash -c "source $HOME/.nvm/nvm.sh && npm install -g eslint"
 
+# Install latest yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
+
 # Install Azure Functions and Azure CLI
 RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
     && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \

diff --git a/containers/azure-functions-node-lts/.devcontainer/Dockerfile b/containers/azure-functions-node-lts/.devcontainer/Dockerfile
@@ -5,8 +5,8 @@
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1
 
-# Install git, process tools, bash
-RUN apt-get update && apt-get -y install git procps
+# Verify git and needed tools are installed
+RUN apt-get update && apt-get -y install git curl tar procps
 
 # Install Node.js via NVM - See https://github.com/creationix/nvm
 # Change the "lts/*" in the two lines below to pick a different version
@@ -18,6 +18,14 @@ RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh
 # Install eslint
 RUN /bin/bash -c "source $HOME/.nvm/nvm.sh && npm install -g eslint"
 
+# Install latest yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
+
 # Install Azure Functions and Azure CLI
 RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
     && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \

diff --git a/containers/javascript-node-8/.devcontainer/Dockerfile b/containers/javascript-node-8/.devcontainer/Dockerfile
@@ -10,15 +10,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Verify git and process tools are installed
-RUN apt-get install -y git procps
+# Verify git and needed tools are installed
+RUN apt-get install -y git curl tar procps
 
-# Install yarn 
-RUN apt-get install -y curl apt-transport-https lsb-release \
-    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
+# Update Yarn to latest
+# See https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
 
 # Install eslint
 RUN npm install -g eslint

diff --git a/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile b/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile
@@ -13,12 +13,8 @@ RUN apt-get update \
 # Verify git and process tools are installed
 RUN apt-get install -y git procps
 
-# Install yarn 
-RUN apt-get install -y curl apt-transport-https lsb-release \
-    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
+# Update yarn
+RUN npm install -g yarn
 
 # Install eslint
 RUN npm install -g eslint

diff --git a/containers/javascript-node-lts/.devcontainer/Dockerfile b/containers/javascript-node-lts/.devcontainer/Dockerfile
@@ -10,16 +10,18 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Verify git and process tools are installed
-RUN apt-get install -y git procps
-
-# Install yarn 
-RUN apt-get install -y curl apt-transport-https lsb-release \
-    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
+# Verify git and needed tools are installed
+RUN apt-get install -y git curl tar procps
 
+# Update Yarn to latest
+# See https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
+
 # Install eslint
 RUN npm install -g eslint
 

diff --git a/containers/typescript-node-8/.devcontainer/Dockerfile b/containers/typescript-node-8/.devcontainer/Dockerfile
@@ -10,15 +10,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Verify git and process tools are installed
-RUN apt-get install -y git procps
+# Verify git and needed tools are installed
+RUN apt-get install -y git curl tar procps
 
-# Install yarn 
-RUN apt-get install -y curl apt-transport-https lsb-release \
-    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
+# Update Yarn to latest
+# See https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
 
 # Install tslint and typescript
 RUN npm install -g tslint typescript

diff --git a/containers/typescript-node-lts/.devcontainer/Dockerfile b/containers/typescript-node-lts/.devcontainer/Dockerfile
@@ -10,15 +10,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Verify git and process tools are installed
-RUN apt-get install -y git procps
+# Verify git and needed tools are installed
+RUN apt-get install -y git curl tar procps
 
-# Install yarn 
-RUN apt-get install -y curl apt-transport-https lsb-release \
-    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
+# Update Yarn to latest
+# See https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
+RUN curl -sfSLO --compressed "https://yarnpkg.com/latest.tar.gz" \
+    && rm -rf /opt/yarn-* \
+    && tar -xzf latest.tar.gz -C /opt/ \
+    && ln -snf /opt/yarn-v*/bin/yarn /usr/local/bin/yarn \
+    && ln -snf /opt/yarn-v*/bin/yarnpkg /usr/local/bin/yarnpkg \
+    && rm latest.tar.gz
 
 # Install tslint and typescript
 RUN npm install -g tslint typescript