diff --git a/3.0/18/Dockerfile b/3.0/18/Dockerfile index 30a310b..2c0673c 100644 --- a/3.0/18/Dockerfile +++ b/3.0/18/Dockerfile @@ -3,10 +3,12 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -\ +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.0/18/slim/Dockerfile b/3.0/18/slim/Dockerfile index ea4e066..b18cdaa 100644 --- a/3.0/18/slim/Dockerfile +++ b/3.0/18/slim/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 # hadolint ignore=DL3009 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ @@ -11,7 +12,8 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -\ +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.1/18/Dockerfile b/3.1/18/Dockerfile index 4dcbfca..8094007 100644 --- a/3.1/18/Dockerfile +++ b/3.1/18/Dockerfile @@ -7,7 +7,8 @@ ENV REFRESHED_AT $REFRESHED_AT SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.1/18/slim/Dockerfile b/3.1/18/slim/Dockerfile index 74867de..7c81dce 100644 --- a/3.1/18/slim/Dockerfile +++ b/3.1/18/slim/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 # hadolint ignore=DL3009 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ @@ -12,7 +13,8 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.2/18/Dockerfile b/3.2/18/Dockerfile index 85e1e4c..b13e960 100644 --- a/3.2/18/Dockerfile +++ b/3.2/18/Dockerfile @@ -3,11 +3,13 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.2/18/slim/Dockerfile b/3.2/18/slim/Dockerfile index 650caed..746fc79 100644 --- a/3.2/18/slim/Dockerfile +++ b/3.2/18/slim/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 # hadolint ignore=DL3009 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ @@ -12,7 +13,8 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.3/18/Dockerfile b/3.3/18/Dockerfile index e70908f..ddb66c4 100644 --- a/3.3/18/Dockerfile +++ b/3.3/18/Dockerfile @@ -3,11 +3,13 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \ diff --git a/3.3/18/slim/Dockerfile b/3.3/18/slim/Dockerfile index f9401a4..b952623 100644 --- a/3.3/18/slim/Dockerfile +++ b/3.3/18/slim/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer "Tim Brust " ARG REFRESHED_AT ENV REFRESHED_AT $REFRESHED_AT +ENV NODE_MAJOR 18 # hadolint ignore=DL3009 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ @@ -12,7 +13,8 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash -\ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update -qq && apt-get install -qq --no-install-recommends \ nodejs \ && apt-get upgrade -qq \