From 854db9888dd0f389b6fe6a27946c700ea577a6b9 Mon Sep 17 00:00:00 2001 From: Mistral OZ - MIO Date: Thu, 3 Nov 2022 12:00:07 +0100 Subject: [PATCH] Fix npm install with ARG --- Dockerfile.apache.node | 2 +- Dockerfile.cli.node | 2 +- Dockerfile.fpm.node | 2 +- Dockerfile.slim.apache | 2 +- Dockerfile.slim.cli | 2 +- Dockerfile.slim.fpm | 2 +- utils/Dockerfile.node.blueprint | 2 +- utils/Dockerfile.slim.blueprint | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile.apache.node b/Dockerfile.apache.node index 7e69988a..cb23c16f 100644 --- a/Dockerfile.apache.node +++ b/Dockerfile.apache.node @@ -25,7 +25,7 @@ RUN apt-get update && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/Dockerfile.cli.node b/Dockerfile.cli.node index 77437d7c..9972bfbd 100644 --- a/Dockerfile.cli.node +++ b/Dockerfile.cli.node @@ -25,7 +25,7 @@ RUN apt-get update && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/Dockerfile.fpm.node b/Dockerfile.fpm.node index abd50c2f..1fdac83c 100644 --- a/Dockerfile.fpm.node +++ b/Dockerfile.fpm.node @@ -25,7 +25,7 @@ RUN apt-get update && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache index 3d47ff3c..822e93ff 100644 --- a/Dockerfile.slim.apache +++ b/Dockerfile.slim.apache @@ -395,7 +395,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \ sudo apt-get update && \ sudo apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \ sudo apt-get clean && \ sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \ fi; diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli index 817bf938..6e83f27d 100644 --- a/Dockerfile.slim.cli +++ b/Dockerfile.slim.cli @@ -300,7 +300,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \ sudo apt-get update && \ sudo apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \ sudo apt-get clean && \ sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \ fi; diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm index a9b72fa4..69ae603e 100644 --- a/Dockerfile.slim.fpm +++ b/Dockerfile.slim.fpm @@ -323,7 +323,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \ sudo apt-get update && \ sudo apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \ sudo apt-get clean && \ sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \ fi; diff --git a/utils/Dockerfile.node.blueprint b/utils/Dockerfile.node.blueprint index 5922ac60..74d4bb17 100644 --- a/utils/Dockerfile.node.blueprint +++ b/utils/Dockerfile.node.blueprint @@ -24,7 +24,7 @@ RUN apt-get update && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/utils/Dockerfile.slim.blueprint b/utils/Dockerfile.slim.blueprint index 4c14d2f8..fd50d147 100644 --- a/utils/Dockerfile.slim.blueprint +++ b/utils/Dockerfile.slim.blueprint @@ -424,7 +424,7 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \ sudo apt-get update && \ sudo apt-get install -y --no-install-recommends yarn && \ - if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \ + if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \ sudo apt-get clean && \ sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \ fi;