Skip to content

Commit fbb7358

Browse files
mistralozmistraloz
committed
Use the new node recommended installation command
1 parent 3313e92 commit fbb7358

18 files changed

+72
-30
lines changed

‎Dockerfile.14-apache-bullseye

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"

‎Dockerfile.14-apache-bullseye-build

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"

‎Dockerfile.14-bullseye

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"

‎Dockerfile.14-bullseye-build

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"

‎Dockerfile.16-apache-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.16-apache-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.16-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎Dockerfile.16-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎Dockerfile.18-apache-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.18-apache-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.18-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎Dockerfile.18-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎Dockerfile.20-apache-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.20-apache-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
119120

120121
RUN apt-get update &&\
121122
apt-get install -y --no-install-recommends gnupg &&\
122-
curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
123+
mkdir -p /etc/apt/keyrings && \
124+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
125+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
123126
apt-get update &&\
124127
apt-get install -y --no-install-recommends nodejs
125128

‎Dockerfile.20-bullseye

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎Dockerfile.20-bullseye-build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
12
FROM debian:bullseye-slim
23

34
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
4950

5051
RUN apt-get update &&\
5152
apt-get install -y --no-install-recommends gnupg &&\
52-
curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
53+
mkdir -p /etc/apt/keyrings && \
54+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
55+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
5356
apt-get update &&\
5457
apt-get install -y --no-install-recommends nodejs
5558

‎orbit.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ tasks:
1919
- use: generate
2020
short: Generates all Dockerfiles
2121
run:
22-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye -p "NodeVersion,14.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
23-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye -p "NodeVersion,16.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
24-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye -p "NodeVersion,18.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
25-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye -p "NodeVersion,20.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
26-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye -p "NodeVersion,14.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
27-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye -p "NodeVersion,16.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
28-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye -p "NodeVersion,18.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
29-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye -p "NodeVersion,20.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
30-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye-build -p "NodeVersion,14.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
31-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye-build -p "NodeVersion,16.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
32-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye-build -p "NodeVersion,18.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
33-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye-build -p "NodeVersion,20.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
34-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye-build -p "NodeVersion,14.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
35-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye-build -p "NodeVersion,16.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
36-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye-build -p "NodeVersion,18.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
37-
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye-build -p "NodeVersion,20.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
22+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye -p "NodeVersion,14;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
23+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye -p "NodeVersion,16;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
24+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye -p "NodeVersion,18;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
25+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye -p "NodeVersion,20;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
26+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye -p "NodeVersion,14;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
27+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye -p "NodeVersion,16;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
28+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye -p "NodeVersion,18;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
29+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye -p "NodeVersion,20;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
30+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye-build -p "NodeVersion,14;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
31+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye-build -p "NodeVersion,16;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
32+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye-build -p "NodeVersion,18;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
33+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye-build -p "NodeVersion,20;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
34+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye-build -p "NodeVersion,14;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
35+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye-build -p "NodeVersion,16;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
36+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye-build -p "NodeVersion,18;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
37+
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye-build -p "NodeVersion,20;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"

‎utils/Dockerfile.blueprint

+4-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ RUN a2enmod rewrite
124124

125125
RUN apt-get update &&\
126126
apt-get install -y --no-install-recommends gnupg &&\
127-
curl -sL https://deb.nodesource.com/setup_{{ $node_version }} | bash - &&\
127+
{{ if lt $node_version "16" }}curl -sL https://deb.nodesource.com/setup_{{ $node_version }}.x | bash - &&\{{ else }}mkdir -p /etc/apt/keyrings && \
128+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
129+
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 &&\{{ end }}
128130
apt-get update &&\
129131
apt-get install -y --no-install-recommends nodejs
130132

@@ -183,7 +185,7 @@ USER root
183185
# | Defines the entrypoint.
184186
# |
185187

186-
ENV NODE_VERSION={{ $node_version }}
188+
ENV NODE_VERSION={{ $node_version }}.x
187189

188190
{{ if eq $variant "standalone" }}
189191
RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app

0 commit comments

Comments
 (0)