Skip to content

Commit d7b4b6b

Browse files
authored
Merge pull request #340 from thecodingmachine/hotfix/npm-install
Fix npm install with ARG
2 parents ea27aba + 854db98 commit d7b4b6b

8 files changed

Lines changed: 8 additions & 8 deletions

Dockerfile.apache.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2626
apt-get update && \
2727
apt-get install -y --no-install-recommends yarn && \
28-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
28+
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
2929
apt-get clean && \
3030
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
3131

Dockerfile.cli.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2626
apt-get update && \
2727
apt-get install -y --no-install-recommends yarn && \
28-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
28+
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
2929
apt-get clean && \
3030
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
3131

Dockerfile.fpm.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2626
apt-get update && \
2727
apt-get install -y --no-install-recommends yarn && \
28-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
28+
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
2929
apt-get clean && \
3030
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
3131

Dockerfile.slim.apache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
395395
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
396396
sudo apt-get update && \
397397
sudo apt-get install -y --no-install-recommends yarn && \
398-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
398+
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
399399
sudo apt-get clean && \
400400
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
401401
fi;

Dockerfile.slim.cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
300300
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
301301
sudo apt-get update && \
302302
sudo apt-get install -y --no-install-recommends yarn && \
303-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
303+
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
304304
sudo apt-get clean && \
305305
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
306306
fi;

Dockerfile.slim.fpm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
323323
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
324324
sudo apt-get update && \
325325
sudo apt-get install -y --no-install-recommends yarn && \
326-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
326+
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
327327
sudo apt-get clean && \
328328
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
329329
fi;

utils/Dockerfile.node.blueprint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2525
apt-get update && \
2626
apt-get install -y --no-install-recommends yarn && \
27-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
27+
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
2828
apt-get clean && \
2929
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
3030

utils/Dockerfile.slim.blueprint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
424424
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
425425
sudo apt-get update && \
426426
sudo apt-get install -y --no-install-recommends yarn && \
427-
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
427+
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
428428
sudo apt-get clean && \
429429
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \
430430
fi;

0 commit comments

Comments
 (0)