From b286a62c8c8d2f0a1a932c2efee1ce2514378ff0 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Tue, 12 Sep 2023 14:05:48 +0200
Subject: [PATCH] Update Node version, refactoring

---
 .github/workflows/manual.yaml |  1 -
 docker-compose.yml            |  4 ++--
 src/docker/7.2/Dockerfile     |  2 +-
 src/docker/7.3/Dockerfile     |  2 +-
 src/docker/7.4/Dockerfile     |  2 +-
 src/docker/8.0/Dockerfile     |  2 +-
 src/docker/8.1/Dockerfile     |  2 +-
 src/docker/8.2/Dockerfile     | 12 +++++++-----
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml
index 16290b1..2089caa 100644
--- a/.github/workflows/manual.yaml
+++ b/.github/workflows/manual.yaml
@@ -53,7 +53,6 @@ jobs:
         with:
           file: "./src/docker/8.0/Dockerfile"
           push: true
-          platforms: linux/amd64,linux/arm64
           tags: "${{env.BUILDKIT_IMAGE}}:8.0"
       -
         name: Build and push 8.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 71fa3b6..083eee1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
     php-fpm:
-        image: jkaninda/laravel-php-fpm:8.2
+        image: jkaninda/laravel-php-fpm:latest
         container_name: php-fpm
         restart: unless-stopped     
         volumes:
@@ -15,7 +15,7 @@ services:
      container_name: nginx-server
      restart: unless-stopped
      ports:
-      - 80:80
+      - 88:80
      volumes:
       - ./laravel:/var/www/html
      environment:
diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile
index d8f0b5e..38e3c29 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=16.x
+ENV NODE_VERSION=19.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile
index 7586755..66e3fd8 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=16.x
+ENV NODE_VERSION=19.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile
index 58ba3a2..e85bc29 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=16.x
+ENV NODE_VERSION=19.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile
index 8063238..15ae028 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=16.x
+ENV NODE_VERSION=19.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile
index dcbbb6d..5f860d5 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=17.x
+ENV NODE_VERSION=19.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile
index b12ef61..8d7f549 100644
--- a/src/docker/8.2/Dockerfile
+++ b/src/docker/8.2/Dockerfile
@@ -1,8 +1,8 @@
-FROM php:8.2.8-fpm
+FROM php:8.2.10-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_VERSION=17.x
+ENV NODE_MAJOR=20
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
@@ -26,9 +26,11 @@ 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
+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