Merge branch 'master' of https://gitlab.huma.net/ludo/opensem

2024-01-22 22:47:39 +01:00
parent 17e322cd88 8ceab7e9f5
commit af5fc8d0ee
12 changed files with 1097 additions and 653 deletions
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -121,7 +121,7 @@ services:
        - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
      ports:
-        - "127.0.0.1:${PHP_FPM_XDEBUG_PORT}:9003"
+        - "${PHP_FPM_XDEBUG_PORT}:9003"
      expose:
        - "9000"
      extra_hosts:
@@ -190,12 +190,11 @@ services:
          - no_proxy
      volumes:
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
-        - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
+        - ${DATA_PATH_HOST}/logs/nginx:/var/log/nginx
        - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
        - ${NGINX_SSL_PATH}:/etc/nginx/ssl
      ports:
        - "${NGINX_HOST_HTTP_PORT}:80"
-        - "${NGINX_HOST_HTTPS_PORT}:443"
      depends_on:
        - php-fpm
      networks:
@@ -205,7 +204,7 @@ services:
        - traefik.port=80
        - traefik.backend=nginx
        - traefik.frontend.rule=Host:opensem.docker.localhost
-        - traefik.http.routers.nginx.rule=Host(`opensem².docker.localhost`)
+        - traefik.http.routers.nginx.rule=Host(`opensem.docker.localhost`)

 ### MySQL ################################################
    mysql:
@@ -298,7 +297,7 @@ services:
        - ./data/certbot/certs/:/var/certs
        - ./certbot/letsencrypt/:/var/www/letsencrypt
      environment:
-        - CN="digital.opensem.ovh"
+        - CN="jardinenvie.com"
        - EMAIL="ludo@huma.net"
      networks:
        - frontend
@@ -322,8 +321,8 @@ services:
      restart: unless-stopped
      image: 'quay.io/soketi/soketi:1.0-16-debian'
      ports:
-        - '${SOKETI_PORT:-6001}:6001'
-        - '${SOKETI_METRICS_SERVER_PORT:-9601}:9601'
+        - '127.0.0.1:${SOKETI_PORT:-6001}:6001'
+        - '127.0.0.1:${SOKETI_METRICS_SERVER_PORT:-9601}:9601'
      environment:
        - SOKETI_DEBUG=1
        - SOKETI_DEFAULT_APP_ID=${PUSHER_APP_ID}
@@ -331,8 +330,6 @@ services:
        - SOKETI_DEFAULT_APP_SECRET=${PUSHER_APP_SECRET}
        - SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES=true
        - DEFAULT_APP_USER_AUTHENTICATION=true
-      expose:
-        - "6001"
      extra_hosts:
        - "dockerhost:${DOCKER_HOST_IP}"
      networks:
@@ -365,8 +362,8 @@ services:
          - INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
          - INSTALL_FFMPEG=${LARAVEL_HORIZON_INSTALL_FFMPEG}
          - INSTALL_AUDIOWAVEFORM=${LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM}
-          - PUID=${LARAVEL_HORIZON_PUID}
-          - PGID=${LARAVEL_HORIZON_PGID}
+          - PUID=${PUID}
+          - PGID=${PGID}
          - IMAGEMAGICK_VERSION=${LARAVEL_HORIZON_IMAGEMAGICK_VERSION}
      volumes:
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
@@ -378,26 +375,22 @@ services:
      networks:
        - backend

-### Proxy ###########################################
-    proxy:
-      restart: always
-      build:
-        context: ./proxy
-        args:
-          - PUID=${PUID}
-          - PGID=${PGID}
-          - TZ=${TIMEZONE}
-          - http_proxy
-          - https_proxy
-          - no_proxy
-      volumes:
-        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
-        - ${PROXY_HOST_LOG_PATH}:/var/log/nginx
-        - ${PROXY_SITES_PATH}:/etc/nginx/sites-available
-        - ${PROXY_SSL_PATH}:/etc/nginx/ssl
+### Meilisearch
+    meilisearch:
+      container_name: meilisearch
+      image: getmeili/meilisearch:latest
+      environment:
+        - http_proxy
+        - https_proxy
+        - MEILI_MASTER_KEY=${MEILI_MASTER_KEY:-masterKey}
+        # - MEILI_NO_ANALYTICS=${MEILI_NO_ANALYTICS:-true}
+        # - MEILI_ENV=${MEILI_ENV:-development}
+        # - MEILI_LOG_LEVEL
+        # - MEILI_DB_PATH=${MEILI_DB_PATH:-/data.ms}
      ports:
-        - "${NGINX_HOST_HTTP_PORT}:80"
-        - "${NGINX_HOST_HTTPS_PORT}:443"
+        - ${MEILI_PORT:-7700}:7700
      networks:
-        - frontend
        - backend
+      volumes:
+        - ${DATA_PATH_HOST}/meili_data:/meili_data
+      restart: unless-stopped
--- a/docker/laravel-horizon/Dockerfile
+++ b/docker/laravel-horizon/Dockerfile
@@ -0,0 +1,344 @@
+#
+#--------------------------------------------------------------------------
+# Image Setup
+#--------------------------------------------------------------------------
+#
+
+ARG LARADOCK_PHP_VERSION
+FROM php:${LARADOCK_PHP_VERSION}-alpine
+
+LABEL maintainer="Ludovic CANDELLIER <ludo@huma.net>"
+
+ARG LARADOCK_PHP_VERSION
+
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+    ;fi
+
+RUN apk --update add wget \
+    curl \
+    git \
+    build-base \
+    libmcrypt-dev \
+    libxml2-dev \
+    pcre-dev \
+    zlib-dev \
+    autoconf \
+    cyrus-sasl-dev \
+    libgsasl-dev \
+    oniguruma-dev \
+    supervisor \
+    procps; \
+    if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ] || \
+    [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
+    apk --update add libressl libressl-dev; \
+    else \
+    apk --update add openssl-dev; \
+    fi
+
+RUN pecl channel-update pecl.php.net; \
+    docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \
+    [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") != "80000" ]; then \
+    php -m | grep -oiE '^tokenizer$'; \
+    else \
+    docker-php-ext-install tokenizer; \
+    fi
+
+# Add a non-root user to help install ffmpeg:
+ARG PUID=1000
+ENV PUID ${PUID}
+ARG PGID=1000
+ENV PGID ${PGID}
+
+RUN addgroup -g ${PGID} laradock && \
+    adduser -D -G laradock -u ${PUID} laradock
+
+#Install BZ2:
+ARG INSTALL_BZ2=false
+RUN if [ ${INSTALL_BZ2} = true ]; then \
+    apk --update add bzip2-dev; \
+    docker-php-ext-install bz2 \
+    ;fi
+
+###########################################################################
+# PHP GnuPG:
+###########################################################################
+
+ARG INSTALL_GNUPG=false
+
+RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \
+    apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \
+    apk add --no-cache --no-progress gpgme; \
+    pecl install gnupg; \
+    docker-php-ext-enable gnupg; \
+    fi
+
+#Install LDAP
+ARG INSTALL_LDAP=false;
+RUN set -eux; if [ ${INSTALL_LDAP} = true ]; then \
+    apk add --no-cache --no-progress openldap-dev; \
+    docker-php-ext-install ldap; \
+    php -m | grep -oiE '^ldap$'; \
+    fi
+
+#Install GD package:
+ARG INSTALL_GD=false
+RUN if [ ${INSTALL_GD} = true ]; then \
+    apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \
+    if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ] || [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    else \
+    ## docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \    
+    fi && \
+    docker-php-ext-install gd \
+    ;fi
+
+#Install ImageMagick package:
+ARG INSTALL_IMAGEMAGICK=false
+ARG IMAGEMAGICK_VERSION=latest
+ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
+RUN set -eux; \
+    if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
+    apk add --update --no-cache imagemagick-dev imagemagick; \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+    cd /tmp && \
+    if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
+    git clone https://github.com/Imagick/imagick; \
+    else \
+    git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
+    fi && \
+    cd imagick && \
+    phpize && \
+    ./configure && \
+    make && \
+    make install && \
+    rm -r /tmp/imagick; \
+    else \
+    pecl install imagick; \
+    fi && \
+    docker-php-ext-enable imagick; \
+    php -m | grep -q 'imagick'; \
+    fi
+
+#Install GMP package:
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+    apk add --update --no-cache gmp gmp-dev; \
+    docker-php-ext-install gmp \
+    ;fi
+
+#Install BCMath package:
+ARG INSTALL_BCMATH=false
+RUN if [ ${INSTALL_BCMATH} = true ]; then \
+    docker-php-ext-install bcmath \
+    ;fi
+
+#Install Sockets package:
+ARG INSTALL_SOCKETS=false
+RUN if [ ${INSTALL_SOCKETS} = true ]; then \
+    docker-php-ext-install sockets \
+    ;fi
+
+# Install PostgreSQL drivers:
+ARG INSTALL_PGSQL=false
+RUN if [ ${INSTALL_PGSQL} = true ]; then \
+    apk --update add postgresql-dev \
+    && docker-php-ext-install pdo_pgsql \
+    ;fi
+
+# Install ZipArchive:
+ARG INSTALL_ZIP_ARCHIVE=false
+RUN set -eux; \
+    if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+    apk --update add libzip-dev && \
+    if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+    docker-php-ext-configure zip; \
+    else \
+    docker-php-ext-configure zip --with-libzip; \
+    fi && \
+    # Install the zip extension
+    docker-php-ext-install zip \
+    ;fi
+
+# Install PhpRedis package:
+ARG INSTALL_PHPREDIS=false
+RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
+    # Install Php Redis Extension
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    printf "\n" | pecl install -o -f redis-4.3.0; \
+    else \
+    printf "\n" | pecl install -o -f redis; \
+    fi; \
+    rm -rf /tmp/pear; \
+    docker-php-ext-enable redis; \
+    fi
+
+ARG INSTALL_FFMPEG=false
+RUN if [ ${INSTALL_FFMPEG} = true ]; then \
+    # Add ffmpeg to horizon
+    apk add ffmpeg \
+    ;fi
+
+# Install BBC Audio Waveform Image Generator:
+ARG INSTALL_AUDIOWAVEFORM=false
+RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
+    apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev \
+    && apk add autoconf automake libtool gettext \
+    && wget https://github.com/xiph/flac/archive/1.3.3.tar.gz \
+    && tar xzf 1.3.3.tar.gz \
+    && cd flac-1.3.3 \
+    && ./autogen.sh \
+    && ./configure --enable-shared=no \
+    && make \
+    && make install \
+    && cd .. \
+    && git clone https://github.com/bbc/audiowaveform.git \
+    && cd audiowaveform \
+    && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
+    && tar xzf release-1.10.0.tar.gz \
+    && ln -s googletest-release-1.10.0/googletest googletest \
+    && ln -s googletest-release-1.10.0/googlemock googlemock \
+    && mkdir build \
+    && cd build \
+    && cmake .. \
+    && make \
+    && make install \
+    ;fi
+
+#####################################
+# poppler-utils:
+#####################################
+USER root
+
+ARG INSTALL_POPPLER_UTILS=false
+
+RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
+    apk add --update --no-cache poppler-utils antiword \
+    ;fi
+
+# Install Cassandra drivers:
+ARG INSTALL_CASSANDRA=false
+RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+    echo "PHP Driver for Cassandra is not supported for PHP 8.0."; \
+    else \
+    apk add --update --no-cache cassandra-cpp-driver libuv gmp \
+    && apk add --update --no-cache cassandra-cpp-driver-dev gmp-dev --virtual .build-sec \
+    && cd /usr/src \
+    && git clone https://github.com/datastax/php-driver.git \
+    && cd php-driver/ext \
+    && phpize \
+    && mkdir -p /usr/src/php-driver/build \
+    && cd /usr/src/php-driver/build \
+    && ../ext/configure > /dev/null \
+    && make clean > /dev/null \
+    && make > /dev/null 2>&1 \
+    && make install \
+    && docker-php-ext-enable cassandra \
+    && apk del .build-sec; \
+    fi \
+    ;fi
+
+# Install MongoDB drivers:
+ARG INSTALL_MONGO=false
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    pecl install mongo; \
+    docker-php-ext-enable mongo; \
+    else \
+    pecl install mongodb; \
+    docker-php-ext-enable mongodb; \
+    fi; \
+    fi
+
+###########################################################################
+# YAML: extension
+###########################################################################
+
+ARG INSTALL_YAML=false
+
+RUN if [ ${INSTALL_YAML} = true ]; then \
+    apk --update add -U --no-cache --virtual temp yaml-dev \
+    && apk add --no-cache yaml \
+    && docker-php-source extract; \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    pecl install yaml-1.3.2; \
+    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+    pecl install yaml-2.0.4; \
+    else \
+    pecl install yaml; \
+    fi \
+    && docker-php-ext-enable yaml \
+    && pecl clear-cache \
+    && docker-php-source delete \
+    && apk del temp \
+    ;fi
+
+###########################################################################
+# PHP Memcached:
+###########################################################################
+
+ARG INSTALL_MEMCACHED=false
+
+RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
+    apk --update add libmemcached-dev; \
+    # Install the php memcached extension
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    pecl install memcached-2.2.0; \
+    else \
+    pecl install memcached; \
+    fi; \
+    docker-php-ext-enable memcached; \
+    php -m | grep -r 'memcached'; \
+    fi
+
+#--------------------------------------------------------------------------
+# Clean up
+#--------------------------------------------------------------------------
+
+RUN rm /var/cache/apk/* \
+    && mkdir -p /var/www
+
+#
+#--------------------------------------------------------------------------
+# Optional Supervisord Configuration
+#--------------------------------------------------------------------------
+#
+# Modify the ./supervisor.conf file to match your App's requirements.
+# Make sure you rebuild your container with every change.
+#
+
+COPY supervisord.conf /etc/supervisord.conf
+
+ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c",  "/etc/supervisord.conf"]
+
+#
+#--------------------------------------------------------------------------
+# Optional Software's Installation
+#--------------------------------------------------------------------------
+#
+# If you need to modify this image, feel free to do it right here.
+#
+# -- Your awesome modifications go here -- #
+
+#
+#--------------------------------------------------------------------------
+# Check PHP version
+#--------------------------------------------------------------------------
+#
+
+RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
+
+#
+#--------------------------------------------------------------------------
+# Final Touch
+#--------------------------------------------------------------------------
+#
+
+WORKDIR /etc/supervisor/conf.d/
--- a/docker/laravel-horizon/supervisord.conf
+++ b/docker/laravel-horizon/supervisord.conf
@@ -0,0 +1,10 @@
+[supervisord]
+nodaemon=true
+[supervisorctl]
+[inet_http_server]
+port = 127.0.0.1:9001
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[include]
+files = supervisord.d/*.conf
--- a/docker/laravel-horizon/supervisord.d/laravel-horizon.conf
+++ b/docker/laravel-horizon/supervisord.d/laravel-horizon.conf
@@ -0,0 +1,9 @@
+[program:laravel-horizon]
+process_name=%(program_name)s_%(process_num)02d
+user=laradock
+command=php /var/www/artisan horizon
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/var/www/storage/logs/horizon.log
+stopwaitsecs=3600
--- a/docker/laravel-horizon/supervisord.d/laravel-horizon.conf.example
+++ b/docker/laravel-horizon/supervisord.d/laravel-horizon.conf.example
@@ -0,0 +1,8 @@
+[program:laravel-horizon]
+process_name=%(program_name)s_%(process_num)02d
+user=laradock
+command=php /var/www/artisan horizon
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/var/www/storage/logs/horizon.log
--- a/docker/matomo/Dockerfile
+++ b/docker/matomo/Dockerfile
@@ -1,5 +1,4 @@
 FROM matomo:latest
-# FROM bitnami/minideb:latest

 LABEL maintainer="Ludovic CANDELLIER <ludo@huma.net>"

--- a/docker/php-fpm/Dockerfile
+++ b/docker/php-fpm/Dockerfile
--- a/docker/php-fpm/apt_sources/php.list
+++ b/docker/php-fpm/apt_sources/php.list
@@ -1 +1 @@
-deb https://packages.sury.org/php/ bullseye main
+deb https://packages.sury.org/php/ bullseye main
--- a/docker/phpmyadmin/Dockerfile
+++ b/docker/phpmyadmin/Dockerfile
@@ -0,0 +1,9 @@
+FROM phpmyadmin/phpmyadmin
+
+LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>"
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose phpMyAdmin on port 80
+EXPOSE 80
--- a/docker/soketi/Dockerfile
+++ b/docker/soketi/Dockerfile
@@ -0,0 +1,7 @@
+FROM quay.io/soketi/soketi:latest
+
+LABEL maintainer="WuweiMing <wwm041544363@gmail.com>"
+
+CMD ["node /app/bin/server.js start"]
+
+EXPOSE 6001 9601
--- a/docker/workspace/Dockerfile
+++ b/docker/workspace/Dockerfile
@@ -23,24 +23,29 @@ RUN groupadd -g ${PGID} laradock; \
    useradd -l -u ${PUID} -g laradock -m laradock; \
    usermod -p "*" laradock -s /bin/bash;

+ARG LARADOCK_PHP_VERSION
+
 # always run apt update when start and after add new source list, then clean up at end.
 RUN apt-get update -yqq; \
    apt-get upgrade -yqq; \
    apt-get -yqq install --no-install-recommends apt-transport-https lsb-release tzdata ca-certificates curl wget \
    apt-utils libzip-dev joe zip unzip rsync openssh-client git mc bzip2 nano default-mysql-client supervisor inetutils-ping mydumper \
-    wkhtmltopdf ghostscript jpegoptim optipng pngquant gifsicle chromium chromium-sandbox
+    wkhtmltopdf ghostscript jpegoptim optipng pngquant gifsicle chromium chromium-sandbox poppler-utils graphviz

 COPY ./apt_sources/php.list /etc/apt/sources.list.d/php.list

 RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg;

+
 RUN apt-get update -yqq; \
-    apt install -yqq --no-install-recommends php8.0-apcu php8.0-bcmath php8.0-bz2 php8.0-cli php8.0-common php8.0-curl php8.0-dev php8.0-gd php8.0-igbinary php8.0-imagick \
-    php8.0-intl php8.0-mbstring php8.0-mcrypt php8.0-mysql php8.0-opcache php8.0-readline php8.0-redis php8.0-sqlite3 php8.0-tidy php8.0-uuid php8.0-xml php8.0-yaml php8.0-zip
+    apt install -yqq --no-install-recommends php${LARADOCK_PHP_VERSION}-apcu php${LARADOCK_PHP_VERSION}-bcmath php${LARADOCK_PHP_VERSION}-bz2 php${LARADOCK_PHP_VERSION}-cli php${LARADOCK_PHP_VERSION}-common php${LARADOCK_PHP_VERSION}-curl php${LARADOCK_PHP_VERSION}-dev php${LARADOCK_PHP_VERSION}-gd php${LARADOCK_PHP_VERSION}-igbinary php${LARADOCK_PHP_VERSION}-imagick \
+    php${LARADOCK_PHP_VERSION}-intl php${LARADOCK_PHP_VERSION}-mbstring php${LARADOCK_PHP_VERSION}-mcrypt php${LARADOCK_PHP_VERSION}-mysql php${LARADOCK_PHP_VERSION}-opcache php${LARADOCK_PHP_VERSION}-readline php${LARADOCK_PHP_VERSION}-redis php${LARADOCK_PHP_VERSION}-sqlite3 php${LARADOCK_PHP_VERSION}-tidy php${LARADOCK_PHP_VERSION}-uuid php${LARADOCK_PHP_VERSION}-xml php${LARADOCK_PHP_VERSION}-yaml php${LARADOCK_PHP_VERSION}-zip

-RUN apt-get install -yqq --no-install-recommends nodejs npm python2
+RUN apt-get install -yqq --no-install-recommends nodejs npm

-RUN update-alternatives --install /usr/bin/python python /usr/bin/python2 1
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
+
+# RUN update-alternatives --install /usr/bin/python python /usr/bin/python2 1

 ###########################################################################
 # Set Timezone
@@ -71,11 +76,11 @@ RUN echo "" >> ~/.bashrc && \
 ARG COMPOSER_VERSION=2
 ENV COMPOSER_VERSION ${COMPOSER_VERSION}
 RUN set -eux; \
-      if [ "$COMPOSER_VERSION" = "1" ] || [ "$COMPOSER_VERSION" = "2" ]; then \
-          composer self-update --${COMPOSER_VERSION}; \
-      else \
-          composer self-update ${COMPOSER_VERSION}; \
-      fi
+    if [ "$COMPOSER_VERSION" = "1" ] || [ "$COMPOSER_VERSION" = "2" ]; then \
+    composer self-update --${COMPOSER_VERSION}; \
+    else \
+    composer self-update ${COMPOSER_VERSION}; \
+    fi

 USER laradock

@@ -138,8 +143,8 @@ RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \
    echo_supervisord_conf > /etc/supervisord.conf && \
    sed -i 's/\;\[include\]/\[include\]/g' /etc/supervisord.conf && \
    sed -i 's/\;files\s.*/files = supervisord.d\/*.conf/g' /etc/supervisord.conf \
-  ;fi \
-;fi
+    ;fi \
+    ;fi

 ###########################################################################
 # GIT:
@@ -153,11 +158,19 @@ RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \

 RUN npm install -g pm2

+###########################################################################
+# NVM
+###########################################################################
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
+# RUN export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+# RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################

-RUN set -xe; php -v | head -n 1 | grep -q "PHP 8.0."
+# RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
+

 #
 #--------------------------------------------------------------------------
@@ -178,3 +191,6 @@ RUN apt-get clean && \
 WORKDIR /var/www

 USER laradock
+
+# RUN git config --global user.email "ludo@huma.net" \
+#    git config --global user.name "Ludovic CANDELLIER"
--- a/docker/workspace/apt_sources/php.list
+++ b/docker/workspace/apt_sources/php.list
@@ -1 +1 @@
-deb https://packages.sury.org/php/ bullseye main
+deb https://packages.sury.org/php/ bookworm main