wip;

lazerg · Jun 19, 2024 · b1ed790 · b1ed790
1 parent 8c64921
commit b1ed790
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 47 deletions.
diff --git a/php80.Dockerfile b/php80.Dockerfile
@@ -1,5 +1,6 @@
 FROM php:8.0.30-fpm
 
+# Update and install dependencies
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
@@ -10,31 +11,38 @@ RUN apt-get update && apt-get install -y \
         libzip-dev \
         libonig-dev \
         graphviz \
+        libicu-dev \
         ghostscript \
         supervisor \
-        dos2unix mc htop nano wget nginx \
+        dos2unix  \
+        mc  \
+        htop  \
+        nano  \
+        wget  \
+        nginx  \
+        git \
 
-    # Nodejs
+    # Node.js
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn \
 
-    # GD
+    # GD extension
     && docker-php-ext-configure gd \
         --with-freetype=/usr/include/ \
         --with-jpeg=/usr/include/ \
-        --with-freetype=/usr/include/ \
     && docker-php-ext-install gd \
 
-    # Swoole
+    # Swoole extension
     && pecl install swoole \
     && docker-php-ext-enable swoole \
 
-    # Redis
+    # Redis extension
     && pecl install -o -f redis \
-    &&  rm -rf /tmp/pear \
-    &&  docker-php-ext-enable redis \
+    && rm -rf /tmp/pear \
+    && docker-php-ext-enable redis \
 
+    # Other PHP extensions
     && docker-php-ext-install pdo_mysql \
     && docker-php-ext-install zip \
     && docker-php-ext-install intl \
@@ -43,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install pcntl \
     && docker-php-source delete \
 
-    # Postgresql
+    # PostgreSQL
     && apt-get install -y libpq-dev \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
     && docker-php-ext-install pdo pdo_pgsql pgsql \
@@ -54,8 +62,8 @@ RUN apt-get update && apt-get install -y \
 
     # Aliases
     && echo "\
-    alias 'p=/var/www/app/vendor/bin/phpunit' \n\
-    alias 'pf=/var/www/app/vendor/bin/phpunit --filter' \n\
+    alias 'p=php artisan test' \n\
+    alias 'pf=php artisan test --filter=' \n\
     " >> ~/.bashrc
 
 WORKDIR /var/www/app/

diff --git a/php81.Dockerfile b/php81.Dockerfile
@@ -1,5 +1,6 @@
-FROM php:8.1.27-fpm
+FROM php:8.1.29-fpm
 
+# Update and install dependencies
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
@@ -13,29 +14,35 @@ RUN apt-get update && apt-get install -y \
         libicu-dev \
         ghostscript \
         supervisor \
-        dos2unix mc htop nano wget nginx \
+        dos2unix  \
+        mc  \
+        htop  \
+        nano  \
+        wget  \
+        nginx  \
+        git \
 
-    # Nodejs
+    # Node.js
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn \
 
-    # GD
+    # GD extension
     && docker-php-ext-configure gd \
         --with-freetype=/usr/include/ \
         --with-jpeg=/usr/include/ \
-        --with-freetype=/usr/include/ \
     && docker-php-ext-install gd \
 
-    # Swoole
+    # Swoole extension
     && pecl install swoole \
     && docker-php-ext-enable swoole \
 
-    # Redis
+    # Redis extension
     && pecl install -o -f redis \
-    &&  rm -rf /tmp/pear \
-    &&  docker-php-ext-enable redis \
+    && rm -rf /tmp/pear \
+    && docker-php-ext-enable redis \
 
+    # Other PHP extensions
     && docker-php-ext-install pdo_mysql \
     && docker-php-ext-install zip \
     && docker-php-ext-install intl \
@@ -44,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install pcntl \
     && docker-php-source delete \
 
-    # Postgresql
+    # PostgreSQL
     && apt-get install -y libpq-dev \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
     && docker-php-ext-install pdo pdo_pgsql pgsql \
@@ -55,8 +62,8 @@ RUN apt-get update && apt-get install -y \
 
     # Aliases
     && echo "\
-    alias 'p=/var/www/app/vendor/bin/phpunit' \n\
-    alias 'pf=/var/www/app/vendor/bin/phpunit --filter' \n\
+    alias 'p=php artisan test' \n\
+    alias 'pf=php artisan test --filter=' \n\
     " >> ~/.bashrc
 
 WORKDIR /var/www/app/

diff --git a/php82.Dockerfile b/php82.Dockerfile
@@ -1,5 +1,6 @@
-FROM php:8.2.15-fpm
+FROM php:8.2.20-fpm
 
+# Update and install dependencies
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
@@ -13,29 +14,35 @@ RUN apt-get update && apt-get install -y \
         libicu-dev \
         ghostscript \
         supervisor \
-        dos2unix mc htop nano wget nginx \
+        dos2unix  \
+        mc  \
+        htop  \
+        nano  \
+        wget  \
+        nginx  \
+        git \
 
-    # Nodejs
+    # Node.js
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn \
 
-    # GD
+    # GD extension
     && docker-php-ext-configure gd \
         --with-freetype=/usr/include/ \
         --with-jpeg=/usr/include/ \
-        --with-freetype=/usr/include/ \
     && docker-php-ext-install gd \
 
-    # Swoole
+    # Swoole extension
     && pecl install swoole \
     && docker-php-ext-enable swoole \
 
-    # Redis
+    # Redis extension
     && pecl install -o -f redis \
-    &&  rm -rf /tmp/pear \
-    &&  docker-php-ext-enable redis \
+    && rm -rf /tmp/pear \
+    && docker-php-ext-enable redis \
 
+    # Other PHP extensions
     && docker-php-ext-install pdo_mysql \
     && docker-php-ext-install zip \
     && docker-php-ext-install intl \
@@ -44,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install pcntl \
     && docker-php-source delete \
 
-    # Postgresql
+    # PostgreSQL
     && apt-get install -y libpq-dev \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
     && docker-php-ext-install pdo pdo_pgsql pgsql \
@@ -55,8 +62,8 @@ RUN apt-get update && apt-get install -y \
 
     # Aliases
     && echo "\
-    alias 'p=/var/www/app/vendor/bin/phpunit' \n\
-    alias 'pf=/var/www/app/vendor/bin/phpunit --filter' \n\
+    alias 'p=php artisan test' \n\
+    alias 'pf=php artisan test --filter=' \n\
     " >> ~/.bashrc
 
 WORKDIR /var/www/app/

diff --git a/php83.Dockerfile b/php83.Dockerfile
@@ -1,5 +1,6 @@
-FROM php:8.3.2-fpm
+FROM php:8.3.8-fpm
 
+# Update and install dependencies
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
@@ -13,29 +14,35 @@ RUN apt-get update && apt-get install -y \
         libicu-dev \
         ghostscript \
         supervisor \
-        dos2unix mc htop nano wget nginx \
+        dos2unix  \
+        mc  \
+        htop  \
+        nano  \
+        wget  \
+        nginx  \
+        git \
 
-    # Nodejs
+    # Node.js
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn \
 
-    # GD
+    # GD extension
     && docker-php-ext-configure gd \
         --with-freetype=/usr/include/ \
         --with-jpeg=/usr/include/ \
-        --with-freetype=/usr/include/ \
     && docker-php-ext-install gd \
 
-    # Swoole
+    # Swoole extension
     && pecl install swoole \
     && docker-php-ext-enable swoole \
 
-    # Redis
+    # Redis extension
     && pecl install -o -f redis \
-    &&  rm -rf /tmp/pear \
-    &&  docker-php-ext-enable redis \
+    && rm -rf /tmp/pear \
+    && docker-php-ext-enable redis \
 
+    # Other PHP extensions
     && docker-php-ext-install pdo_mysql \
     && docker-php-ext-install zip \
     && docker-php-ext-install intl \
@@ -44,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install pcntl \
     && docker-php-source delete \
 
-    # Postgresql
+    # PostgreSQL
     && apt-get install -y libpq-dev \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
     && docker-php-ext-install pdo pdo_pgsql pgsql \
@@ -55,8 +62,8 @@ RUN apt-get update && apt-get install -y \
 
     # Aliases
     && echo "\
-    alias 'p=/var/www/app/vendor/bin/phpunit' \n\
-    alias 'pf=/var/www/app/vendor/bin/phpunit --filter' \n\
+    alias 'p=php artisan test' \n\
+    alias 'pf=php artisan test --filter=' \n\
     " >> ~/.bashrc
 
 WORKDIR /var/www/app/