Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit abf399a

Browse files
authored
Merge pull request #28 from microsoft/clantz/yarn-cosmetic
[Non-blocking cosmetic fix] Add missing "&&" into Node definitions when updating yarn
2 parents 39c80bf + 632e321 commit abf399a

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

containers/javascript-node-8/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN apt-get install -y git procps
1616
# Remove outdated yarn from /opt and install via package
1717
# so it can be easily updated via apt-get upgrade yarn
1818
RUN rm -rf /opt/yarn-* \
19-
rm -f /usr/local/bin/yarn \
20-
rm -f /usr/local/bin/yarnpkg \
19+
&& rm -f /usr/local/bin/yarn \
20+
&& rm -f /usr/local/bin/yarnpkg \
2121
&& apt-get install -y curl apt-transport-https lsb-release \
2222
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2323
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \

containers/javascript-node-lts-mongo/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN apt-get install -y git procps
1616
# Remove outdated yarn from /opt and install via package
1717
# so it can be easily updated via apt-get upgrade yarn
1818
RUN rm -rf /opt/yarn-* \
19-
rm -f /usr/local/bin/yarn \
20-
rm -f /usr/local/bin/yarnpkg \
19+
&& rm -f /usr/local/bin/yarn \
20+
&& rm -f /usr/local/bin/yarnpkg \
2121
&& apt-get install -y curl apt-transport-https lsb-release \
2222
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2323
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \

containers/javascript-node-lts/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN apt-get install -y git procps
1616
# Remove outdated yarn from /opt and install via package
1717
# so it can be easily updated via apt-get upgrade yarn
1818
RUN rm -rf /opt/yarn-* \
19-
rm -f /usr/local/bin/yarn \
20-
rm -f /usr/local/bin/yarnpkg \
19+
&& rm -f /usr/local/bin/yarn \
20+
&& rm -f /usr/local/bin/yarnpkg \
2121
&& apt-get install -y curl apt-transport-https lsb-release \
2222
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2323
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \

containers/typescript-node-8/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN apt-get install -y git procps
1616
# Remove outdated yarn from /opt and install via package
1717
# so it can be easily updated via apt-get upgrade yarn
1818
RUN rm -rf /opt/yarn-* \
19-
rm -f /usr/local/bin/yarn \
20-
rm -f /usr/local/bin/yarnpkg \
19+
&& rm -f /usr/local/bin/yarn \
20+
&& rm -f /usr/local/bin/yarnpkg \
2121
&& apt-get install -y curl apt-transport-https lsb-release \
2222
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2323
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \

containers/typescript-node-lts/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN apt-get install -y git procps
1616
# Remove outdated yarn from /opt and install via package
1717
# so it can be easily updated via apt-get upgrade yarn
1818
RUN rm -rf /opt/yarn-* \
19-
rm -f /usr/local/bin/yarn \
20-
rm -f /usr/local/bin/yarnpkg \
19+
&& rm -f /usr/local/bin/yarn \
20+
&& rm -f /usr/local/bin/yarnpkg \
2121
&& apt-get install -y curl apt-transport-https lsb-release \
2222
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2323
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \

0 commit comments

Comments
 (0)