From 0014521393012673067e6b7db763588dd3c6e725 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Fri, 28 Oct 2022 15:19:20 +0200 Subject: [PATCH 1/2] Update php version --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e2e1ed..51d1322 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.1.10-fpm +FROM php:8.2.0RC5-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 ENV DOMAIN=_ ENV CLIENT_MAX_BODY_SIZE=15M -ENV NODE_VERSION=16.x +ENV NODE_VERSION=17.x # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -26,9 +26,9 @@ RUN apt-get update && apt-get install -y \ nano \ cron -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - +#RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - # Install Node -RUN apt-get install -y nodejs +#RUN apt-get install -y nodejs # Install nginx RUN apt-get update && apt-get install -y nginx @@ -66,8 +66,8 @@ RUN docker-php-ext-install pdo_mysql RUN docker-php-ext-install pdo_pgsql -# Get latest Composer -COPY --from=composer:latest /usr/bin/composer /usr/bin/composer +# Install Composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # Install Laravel Envoy RUN composer global require "laravel/envoy=~1.0" From 721be274bd513a2896eca257531cd41d83348f2b Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Fri, 28 Oct 2022 15:37:44 +0200 Subject: [PATCH 2/2] Refactoring --- Dockerfile | 7 ++----- README.md | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fdc5e5..f695fd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,11 +54,8 @@ RUN docker-php-ext-install pdo_mysql RUN docker-php-ext-install pdo_pgsql -# Get latest Composer -COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - -# Install Laravel Envoy -RUN composer global require "laravel/envoy=~1.0" +# Install Composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # Set working directory WORKDIR $WORKDIR diff --git a/README.md b/README.md index cc809b3..77de21b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ## Specifications: -* PHP 8.1 / 8.0 / 7.4 / 7.2 +* PHP 8.2 / 8.1 / 8.0 / 7.4 / 7.2 * Composer * OpenSSL PHP Extension * XML PHP Extension @@ -27,7 +27,6 @@ * Memcached * Laravel Cron Job * Laravel Schedule -* Laravel Envoy * Supervisord * Nodejs * NPM