Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade NodeJS to version 16.x LTS and remove deprecated apt-key usage #172

Merged
merged 1 commit into from
Mar 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions infrastructure/docker/services/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ ARG PROJECT_NAME

FROM ${PROJECT_NAME}_php-base

ARG NODEJS_VERSION=14.x
RUN echo "deb https://deb.nodesource.com/node_${NODEJS_VERSION} bullseye main" > /etc/apt/sources.list.d/nodejs.list \
&& apt-key adv --fetch-keys https://deb.nodesource.com/gpgkey/nodesource.gpg.key
ARG NODEJS_VERSION=16.x
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /usr/share/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODEJS_VERSION} bullseye main" > /etc/apt/sources.list.d/nodejs.list

# Default toys
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
git \
make \
nodejs \
Expand Down
5 changes: 3 additions & 2 deletions infrastructure/docker/services/php-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ FROM debian:11.0-slim

RUN apt-get update \
&& apt install -y --no-install-recommends \
curl \
ca-certificates \
gnupg \
&& echo "deb https://packages.sury.org/php bullseye main" > /etc/apt/sources.list.d/sury.list \
&& apt-key adv --fetch-keys https://packages.sury.org/php/apt.gpg
&& curl -s https://packages.sury.org/php/apt.gpg | gpg --dearmor > /usr/share/keyrings/deb.sury.org-php.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php bullseye main" > /etc/apt/sources.list.d/sury.list

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down