Skip to content

Commit 9987991

Browse files
mistralozmistraloz
authored
Merge pull request #406 from mistraloz/fix/yarn-keys-expired
fix yarn-keys-expired
2 parents 154ace4 + ce582b5 commit 9987991

File tree

8 files changed

+56
-48
lines changed

8 files changed

+56
-48
lines changed

‎Dockerfile.apache.node‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
2121
RUN apt update && \
2222
apt install -y --no-install-recommends gnupg && \
2323
if [[ "${NODE_VERSION}" -lt "16" ]]; then \
24-
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
24+
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash -; \
2525
else \
26-
sudo mkdir -p /etc/apt/keyrings && \
27-
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
26+
mkdir -p /etc/apt/keyrings && \
27+
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
2929
fi && \
3030
apt update && \
3131
apt install -y --no-install-recommends nodejs && \
32-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
33-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
34-
apt update && \
35-
apt install -y --no-install-recommends yarn && \
32+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
33+
corepack enable && corepack prepare yarn@stable --activate; \
34+
else \
35+
npm install -g yarn; \
36+
fi && \
3637
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
3738
apt clean && \
3839
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

‎Dockerfile.cli.node‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
2121
RUN apt update && \
2222
apt install -y --no-install-recommends gnupg && \
2323
if [[ "${NODE_VERSION}" -lt "16" ]]; then \
24-
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
24+
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash -; \
2525
else \
26-
sudo mkdir -p /etc/apt/keyrings && \
27-
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
26+
mkdir -p /etc/apt/keyrings && \
27+
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
2929
fi && \
3030
apt update && \
3131
apt install -y --no-install-recommends nodejs && \
32-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
33-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
34-
apt update && \
35-
apt install -y --no-install-recommends yarn && \
32+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
33+
corepack enable && corepack prepare yarn@stable --activate; \
34+
else \
35+
npm install -g yarn; \
36+
fi && \
3637
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
3738
apt clean && \
3839
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

‎Dockerfile.fpm.node‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
2121
RUN apt update && \
2222
apt install -y --no-install-recommends gnupg && \
2323
if [[ "${NODE_VERSION}" -lt "16" ]]; then \
24-
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
24+
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash -; \
2525
else \
26-
sudo mkdir -p /etc/apt/keyrings && \
27-
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
26+
mkdir -p /etc/apt/keyrings && \
27+
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
28+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
2929
fi && \
3030
apt update && \
3131
apt install -y --no-install-recommends nodejs && \
32-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
33-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
34-
apt update && \
35-
apt install -y --no-install-recommends yarn && \
32+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
33+
corepack enable && corepack prepare yarn@stable --activate; \
34+
else \
35+
npm install -g yarn; \
36+
fi && \
3637
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
3738
apt clean && \
3839
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

‎Dockerfile.slim.apache‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,11 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
406406
fi && \
407407
sudo apt update && \
408408
sudo apt install -y --no-install-recommends nodejs && \
409-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
410-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
411-
sudo apt update && \
412-
sudo apt install -y --no-install-recommends yarn && \
409+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
410+
sudo corepack enable && sudo corepack prepare yarn@stable --activate; \
411+
else \
412+
sudo npm install -g yarn; \
413+
fi && \
413414
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
414415
sudo apt clean && \
415416
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \

‎Dockerfile.slim.cli‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,11 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
311311
fi && \
312312
sudo apt update && \
313313
sudo apt install -y --no-install-recommends nodejs && \
314-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
315-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
316-
sudo apt update && \
317-
sudo apt install -y --no-install-recommends yarn && \
314+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
315+
sudo corepack enable && sudo corepack prepare yarn@stable --activate; \
316+
else \
317+
sudo npm install -g yarn; \
318+
fi && \
318319
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
319320
sudo apt clean && \
320321
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \

‎Dockerfile.slim.fpm‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,11 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
330330
fi && \
331331
sudo apt update && \
332332
sudo apt install -y --no-install-recommends nodejs && \
333-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
334-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
335-
sudo apt update && \
336-
sudo apt install -y --no-install-recommends yarn && \
333+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
334+
sudo corepack enable && sudo corepack prepare yarn@stable --activate; \
335+
else \
336+
sudo npm install -g yarn; \
337+
fi && \
337338
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
338339
sudo apt clean && \
339340
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \

‎utils/Dockerfile.node.blueprint‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@ ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
2020
RUN apt update && \
2121
apt install -y --no-install-recommends gnupg && \
2222
if [[ "${NODE_VERSION}" -lt "16" ]]; then \
23-
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
23+
curl -sL --retry 5 --retry-delay 2 https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash -; \
2424
else \
25-
sudo mkdir -p /etc/apt/keyrings && \
26-
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
27-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
25+
mkdir -p /etc/apt/keyrings && \
26+
curl -fsSL --retry 5 --retry-delay 2 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
27+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
2828
fi && \
2929
apt update && \
3030
apt install -y --no-install-recommends nodejs && \
31-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
32-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
33-
apt update && \
34-
apt install -y --no-install-recommends yarn && \
31+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
32+
corepack enable && corepack prepare yarn@stable --activate; \
33+
else \
34+
npm install -g yarn; \
35+
fi && \
3536
if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; fi && \
3637
apt clean && \
3738
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

‎utils/Dockerfile.slim.blueprint‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,11 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
431431
fi && \
432432
sudo apt update && \
433433
sudo apt install -y --no-install-recommends nodejs && \
434-
curl -sS --retry 5 --retry-delay 2 https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
435-
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
436-
sudo apt update && \
437-
sudo apt install -y --no-install-recommends yarn && \
434+
if [[ "${NODE_VERSION}" -ge "16" ]]; then \
435+
sudo corepack enable && sudo corepack prepare yarn@stable --activate; \
436+
else \
437+
sudo npm install -g yarn; \
438+
fi && \
438439
if [[ "${NODE_VERSION}" == "10" ]]; then sudo npm install -g npm@^6.14; fi && \
439440
sudo apt clean && \
440441
sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \

0 commit comments

Comments
 (0)