Skip to content

Commit 180edab

Browse files
cytopiacytopia
committed
Use modern way to install node & yarn
1 parent a2b50e6 commit 180edab

File tree

14 files changed

+257
-147
lines changed

14 files changed

+257
-147
lines changed

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -166,21 +164,29 @@ RUN set -eux \
166164
\
167165
\
168166
# -------------------- nvm --------------------
169-
&& git clone https://github.com/creationix/nvm /opt/nvm \
170-
&& cd /opt/nvm \
171-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
167+
&& NVM_VERSION="$( \
168+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
169+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
170+
| grep -Eo 'v?[.0-9]+' \
171+
| sort -V \
172+
| tail -1 \
173+
)" \
174+
&& mkdir -p /opt/nvm \
175+
\
176+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
177+
| NVM_DIR="/opt/nvm" bash \
172178
\
173179
&& { \
174180
echo 'export NVM_DIR="/opt/nvm"'; \
175181
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
176182
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
177183
} >> /home/devilbox/.bashrc \
178184
\
179-
&& chown -R devilbox:devilbox /opt/nvm \
185+
&& chown -R devilbox:devilbox "/opt/nvm" \
180186
\
181-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
182-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
183-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
187+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
188+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
189+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184190
\
185191
\
186192
# -------------------- awesomeci --------------------
@@ -464,7 +470,9 @@ RUN set -eux \
464470

465471
RUN set -eux \
466472
# -------------------- Software --------------------
467-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
473+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
474+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
475+
\
468476
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
469477
&& git-flow version | grep -E '[0-9][.0-9]+' \
470478
&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -174,21 +172,29 @@ RUN set -eux \
174172
\
175173
\
176174
# -------------------- nvm --------------------
177-
&& git clone https://github.com/creationix/nvm /opt/nvm \
178-
&& cd /opt/nvm \
179-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
175+
&& NVM_VERSION="$( \
176+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
177+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
178+
| grep -Eo 'v?[.0-9]+' \
179+
| sort -V \
180+
| tail -1 \
181+
)" \
182+
&& mkdir -p /opt/nvm \
183+
\
184+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
185+
| NVM_DIR="/opt/nvm" bash \
180186
\
181187
&& { \
182188
echo 'export NVM_DIR="/opt/nvm"'; \
183189
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
184190
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
185191
} >> /home/devilbox/.bashrc \
186192
\
187-
&& chown -R devilbox:devilbox /opt/nvm \
193+
&& chown -R devilbox:devilbox "/opt/nvm" \
188194
\
189-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
190-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
191-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
195+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
196+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
192198
\
193199
\
194200
# -------------------- awesomeci --------------------
@@ -522,7 +528,9 @@ RUN set -eux \
522528
RUN set -eux \
523529
# -------------------- Software --------------------
524530
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
525-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
531+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
532+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
533+
\
526534
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
527535
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
528536
&& git-flow version | grep -E '[0-9][.0-9]+' \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -174,21 +172,29 @@ RUN set -eux \
174172
\
175173
\
176174
# -------------------- nvm --------------------
177-
&& git clone https://github.com/creationix/nvm /opt/nvm \
178-
&& cd /opt/nvm \
179-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
175+
&& NVM_VERSION="$( \
176+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
177+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
178+
| grep -Eo 'v?[.0-9]+' \
179+
| sort -V \
180+
| tail -1 \
181+
)" \
182+
&& mkdir -p /opt/nvm \
183+
\
184+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
185+
| NVM_DIR="/opt/nvm" bash \
180186
\
181187
&& { \
182188
echo 'export NVM_DIR="/opt/nvm"'; \
183189
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
184190
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
185191
} >> /home/devilbox/.bashrc \
186192
\
187-
&& chown -R devilbox:devilbox /opt/nvm \
193+
&& chown -R devilbox:devilbox "/opt/nvm" \
188194
\
189-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
190-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
191-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
195+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
196+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
192198
\
193199
\
194200
# -------------------- awesomeci --------------------
@@ -560,7 +566,9 @@ RUN set -eux \
560566
RUN set -eux \
561567
# -------------------- Software --------------------
562568
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
563-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
569+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
570+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
571+
\
564572
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
565573
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
566574
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -174,21 +172,29 @@ RUN set -eux \
174172
\
175173
\
176174
# -------------------- nvm --------------------
177-
&& git clone https://github.com/creationix/nvm /opt/nvm \
178-
&& cd /opt/nvm \
179-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
175+
&& NVM_VERSION="$( \
176+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
177+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
178+
| grep -Eo 'v?[.0-9]+' \
179+
| sort -V \
180+
| tail -1 \
181+
)" \
182+
&& mkdir -p /opt/nvm \
183+
\
184+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
185+
| NVM_DIR="/opt/nvm" bash \
180186
\
181187
&& { \
182188
echo 'export NVM_DIR="/opt/nvm"'; \
183189
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
184190
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
185191
} >> /home/devilbox/.bashrc \
186192
\
187-
&& chown -R devilbox:devilbox /opt/nvm \
193+
&& chown -R devilbox:devilbox "/opt/nvm" \
188194
\
189-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
190-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
191-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
195+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
196+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
192198
\
193199
\
194200
# -------------------- awesomeci --------------------
@@ -574,7 +580,9 @@ RUN set -eux \
574580
RUN set -eux \
575581
# -------------------- Software --------------------
576582
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
577-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
583+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
584+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
585+
\
578586
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
579587
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
580588
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -176,21 +174,29 @@ RUN set -eux \
176174
\
177175
\
178176
# -------------------- nvm --------------------
179-
&& git clone https://github.com/creationix/nvm /opt/nvm \
180-
&& cd /opt/nvm \
181-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
177+
&& NVM_VERSION="$( \
178+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
179+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
180+
| grep -Eo 'v?[.0-9]+' \
181+
| sort -V \
182+
| tail -1 \
183+
)" \
184+
&& mkdir -p /opt/nvm \
185+
\
186+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
187+
| NVM_DIR="/opt/nvm" bash \
182188
\
183189
&& { \
184190
echo 'export NVM_DIR="/opt/nvm"'; \
185191
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
186192
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
187193
} >> /home/devilbox/.bashrc \
188194
\
189-
&& chown -R devilbox:devilbox /opt/nvm \
195+
&& chown -R devilbox:devilbox "/opt/nvm" \
190196
\
191-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
192-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
193-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
198+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
199+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
194200
\
195201
\
196202
# -------------------- awesomeci --------------------
@@ -587,7 +593,9 @@ RUN set -eux \
587593
RUN set -eux \
588594
# -------------------- Software --------------------
589595
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
590-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
596+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
597+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
598+
\
591599
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
592600
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
593601
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -176,21 +174,29 @@ RUN set -eux \
176174
\
177175
\
178176
# -------------------- nvm --------------------
179-
&& git clone https://github.com/creationix/nvm /opt/nvm \
180-
&& cd /opt/nvm \
181-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
177+
&& NVM_VERSION="$( \
178+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
179+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
180+
| grep -Eo 'v?[.0-9]+' \
181+
| sort -V \
182+
| tail -1 \
183+
)" \
184+
&& mkdir -p /opt/nvm \
185+
\
186+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
187+
| NVM_DIR="/opt/nvm" bash \
182188
\
183189
&& { \
184190
echo 'export NVM_DIR="/opt/nvm"'; \
185191
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
186192
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
187193
} >> /home/devilbox/.bashrc \
188194
\
189-
&& chown -R devilbox:devilbox /opt/nvm \
195+
&& chown -R devilbox:devilbox "/opt/nvm" \
190196
\
191-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
192-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
193-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
198+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
199+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
194200
\
195201
\
196202
# -------------------- awesomeci --------------------
@@ -568,7 +574,9 @@ RUN set -eux \
568574
RUN set -eux \
569575
# -------------------- Software --------------------
570576
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
571-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
577+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
578+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
579+
\
572580
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
573581
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
574582
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.1

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ RUN set -eux \
6060
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
6161
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
6262
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
63-
&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
64-
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
6563
\
6664
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6765
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -175,21 +173,29 @@ RUN set -eux \
175173
\
176174
\
177175
# -------------------- nvm --------------------
178-
&& git clone https://github.com/creationix/nvm /opt/nvm \
179-
&& cd /opt/nvm \
180-
&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
176+
&& NVM_VERSION="$( \
177+
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
178+
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
179+
| grep -Eo 'v?[.0-9]+' \
180+
| sort -V \
181+
| tail -1 \
182+
)" \
183+
&& mkdir -p /opt/nvm \
184+
\
185+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
186+
| NVM_DIR="/opt/nvm" bash \
181187
\
182188
&& { \
183189
echo 'export NVM_DIR="/opt/nvm"'; \
184190
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \
185191
echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \
186192
} >> /home/devilbox/.bashrc \
187193
\
188-
&& chown -R devilbox:devilbox /opt/nvm \
194+
&& chown -R devilbox:devilbox "/opt/nvm" \
189195
\
190-
&& su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
191-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
192-
&& su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
196+
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
197+
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
198+
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
193199
\
194200
\
195201
# -------------------- awesomeci --------------------
@@ -567,7 +573,9 @@ RUN set -eux \
567573
RUN set -eux \
568574
# -------------------- Software --------------------
569575
&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
570-
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
576+
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
577+
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
578+
\
571579
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
572580
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
573581
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

0 commit comments

Comments
 (0)