Merge pull request #8 from robsontenorio/8.4

wip: 8.4

Author: robsontenorio

.github/workflows/docker-publish.yml

@@ -15,41 +15,39 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: robsontenorio/laravel
           flavor: latest=false
           tags: |
             type=ref,event=tag
-            type=raw,enable=${{ github.ref == 'refs/heads/master' }},value=latest      
-      
+            type=raw,enable=${{ github.ref == 'refs/heads/master' }},value=latest
+
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          
+
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: robsontenorio/laravel
           short-description: ${{ github.event.repository.description }}
-
-     

Dockerfile

@@ -1,39 +1,41 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 LABEL maintainer="Robson Tenório"
 LABEL site="https://github.com/robsontenorio/laravel-docker"
 
 ENV TZ=UTC
 ENV LANG="C.UTF-8"
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CONTAINER_ROLE=${CONTAINER_ROLE:-APP}
+ARG CONTAINER_ROLE=APP
+ENV CONTAINER_ROLE=${CONTAINER_ROLE}
 
 WORKDIR /var/www/app
 
 RUN apt update \
-  # Add PHP 8.3 repository
+  # Add PHP 8.4 repository
   && apt install -y software-properties-common && add-apt-repository ppa:ondrej/php \
   # PHP extensions
   && apt install -y \
-  php8.3-bcmath \
-  php8.3-cli \
-  php8.3-curl \
-  php8.3-fpm \
-  php8.3-gd \
-  php8.3-intl \
-  php8.3-mbstring  \
-  php8.3-mysql \
-  php8.3-redis \
-  php8.3-sockets \
-  php8.3-sqlite3 \
-  php8.3-pcov \
-  php8.3-pgsql \
-  php8.3-opcache \
-  php8.3-xml \
-  php8.3-zip \
+  php8.4-bcmath \
+  php8.4-cli \
+  php8.4-curl \
+  php8.4-fpm \
+  php8.4-gd \
+  php8.4-intl \
+  php8.4-mbstring  \
+  php8.4-mysql \
+  php8.4-redis \
+  php8.4-sockets \
+  php8.4-sqlite3 \
+  php8.4-pcov \
+  php8.4-pgsql \
+  php8.4-opcache \
+  php8.4-xml \
+  php8.4-zip \
   # Extra
   curl \
   git \
+  gnupg \
   htop \
   nano \
   nginx \
@@ -52,14 +54,15 @@ RUN curl -sS https://getcomposer.org/installer  | php -- --install-dir=/usr/bin
 # Node, NPM, Yarn
 RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && apt install -y nodejs && npm -g install yarn --unsafe-perm
 
-# Create user/group with id/uid (1000/100)
-RUN groupadd -g 1000 appuser
+# Create user/group with id/uid (1000/1000)
+RUN userdel ubuntu
+RUN groupadd -f -g 1000 appuser
 RUN useradd -u 1000 -m -d /home/appuser -g appuser appuser
 
 # Config files
 COPY --chown=appuser:appuser start.sh /usr/local/bin/start
 COPY --chown=appuser:appuser config/etc /etc
-COPY --chown=appuser:appuser config/etc/php/8.3/cli/conf.d/y-php.ini /etc/php/8.3/fpm/conf.d/y-php.ini
+COPY --chown=appuser:appuser config/etc/php/8.4/cli/conf.d/y-php.ini /etc/php/8.4/fpm/conf.d/y-php.ini
 
 # Permissions for start script
 RUN chmod a+x /usr/local/bin/start
@@ -88,4 +91,4 @@ RUN echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.zshrc
 EXPOSE 8080 8000 3000 3001 9515 9773
 
 # Start services through "supervisor" based on "CONTAINER_ROLE". See "start.sh".
-CMD /usr/local/bin/start
+CMD ["/usr/local/bin/start"]

config/etc/nginx/sites-available/default

@@ -26,9 +26,11 @@ server {
 
     # PHP
     location ~ \.php$ {
-        fastcgi_pass unix:/home/appuser/php8.3-fpm.sock;
+        fastcgi_pass unix:/home/appuser/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
     }
 
     # Prevent access "." files

config/etc/php/8.3/cli/conf.d/y-php.ini renamed to config/etc/php/8.4/cli/conf.d/y-php.ini

@@ -4,7 +4,7 @@ user = appuser
 group = appuser
 listen.owner = appuser
 listen.group = appuser
-listen = /home/appuser/php8.3-fpm.sock
+listen = /home/appuser/php8.4-fpm.sock
 clear_env = no
 
 ; fpm tuning

config/etc/php/8.3/fpm/pool.d/y-www.conf renamed to config/etc/php/8.4/fpm/pool.d/y-www.conf

@@ -1,6 +1,6 @@
 # PHP FPM
 [program:php-fpm]
-command=php-fpm8.3 -F
+command=php-fpm8.4 -F
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr

config/etc/supervisor/conf.d-temp/php-fpm.conf

@@ -5,17 +5,17 @@ set -e
 #   SQLSERVER DRIVERS + TOOLS                    #
 ##################################################
 
-apt install -y php8.3-dev unixodbc-dev
+apt install -y php8.4-dev unixodbc-dev wget
 
-curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
-curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
+wget -qO- https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
 apt update
 ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools18
 
 pecl channel-update pecl.php.net
 pecl install sqlsrv pdo_sqlsrv
-printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.3/mods-available/sqlsrv.ini
-printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.3/mods-available/pdo_sqlsrv.ini
+printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.4/mods-available/sqlsrv.ini
+printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.4/mods-available/pdo_sqlsrv.ini
 phpenmod sqlsrv pdo_sqlsrv
 
-apt purge php8.3-dev -y && apt-get autoremove -y
+apt purge php8.4-dev -y && apt-get autoremove -y