From 510cede37f7f1200b72d559bcd562c91d8e1850c Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 12 Sep 2023 14:11:51 +0200 Subject: [PATCH] Update Node version, refactoring --- src/docker/7.2/Dockerfile | 11 +++++++---- src/docker/7.3/Dockerfile | 10 ++++++---- src/docker/7.4/Dockerfile | 11 +++++++---- src/docker/8.0/Dockerfile | 10 ++++++---- src/docker/8.1/Dockerfile | 11 +++++++---- src/docker/8.2/Dockerfile | 2 +- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile index 38e3c29..861b28c 100644 --- a/src/docker/7.2/Dockerfile +++ b/src/docker/7.2/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.2-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=19.x +ENV NODE_MAJOR=18 # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -24,9 +24,12 @@ RUN apt-get update && apt-get install -y \ nano \ cron -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - - # Install Node -RUN apt-get install -y nodejs +# Install Nodejs +RUN apt-get update && apt-get install -y ca-certificates curl gnupg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN 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 +RUN apt-get update && apt-get install nodejs -y + # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile index 66e3fd8..585c45b 100644 --- a/src/docker/7.3/Dockerfile +++ b/src/docker/7.3/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.3-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=19.x +ENV NODE_MAJOR=18 # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -23,10 +23,12 @@ RUN apt-get update && apt-get install -y \ sqlite3 \ nano \ cron +# Install Nodejs +RUN apt-get update && apt-get install -y ca-certificates curl gnupg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN 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 +RUN apt-get update && apt-get install nodejs -y -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - - # Install Node -RUN apt-get install -y nodejs # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile index e85bc29..c20b6ff 100644 --- a/src/docker/7.4/Dockerfile +++ b/src/docker/7.4/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.4-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=19.x +ENV NODE_MAJOR=18 ARG HOST_UID=1000 ENV USER=www-data # Install system dependencies @@ -26,9 +26,12 @@ RUN apt-get update && apt-get install -y \ nano \ cron -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - - # Install Node -RUN apt-get install -y nodejs +# Install Nodejs +RUN apt-get update && apt-get install -y ca-certificates curl gnupg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN 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 +RUN apt-get update && apt-get install nodejs -y + # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile index 15ae028..203a17e 100644 --- a/src/docker/8.0/Dockerfile +++ b/src/docker/8.0/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.0-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=19.x +ENV NODE_MAJOR=18 ARG HOST_UID=1000 ENV USER=www-data # Install system dependencies @@ -25,10 +25,12 @@ RUN apt-get update && apt-get install -y \ sqlite3 \ nano \ cron +# Install Nodejs +RUN apt-get update && apt-get install -y ca-certificates curl gnupg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN 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 +RUN apt-get update && apt-get install nodejs -y -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - - # Install Node -RUN apt-get install -y nodejs # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile index 5f860d5..641e7bc 100644 --- a/src/docker/8.1/Dockerfile +++ b/src/docker/8.1/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.1-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=19.x +ENV NODE_MAJOR=18 ARG HOST_UID=1000 ENV USER=www-data # Install system dependencies @@ -26,9 +26,12 @@ RUN apt-get update && apt-get install -y \ nano \ cron -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - - # Install Node -RUN apt-get install -y nodejs +# Install Nodejs +RUN apt-get update && apt-get install -y ca-certificates curl gnupg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN 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 +RUN apt-get update && apt-get install nodejs -y + # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile index 8d7f549..0d6ae92 100644 --- a/src/docker/8.2/Dockerfile +++ b/src/docker/8.2/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y \ sqlite3 \ nano \ cron - +# Install Nodejs RUN apt-get update && apt-get install -y ca-certificates curl gnupg RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg RUN 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