From 884d5ad5796f427af989747037d3997c69140aac Mon Sep 17 00:00:00 2001 From: Marc Wolf Date: Fri, 7 Jun 2024 16:22:47 +0200 Subject: [PATCH] [TASK] Raise to PHP 8.3.8, Nginx 1.27.0, Redis 7.2.5 and MariaDB 11.4.2 --- .github/workflows/docker-compose-test.yml | 11 ----------- README.md | 18 +++++++++--------- docker-compose.yml | 6 +++--- docker/php-fpm/Dockerfile | 2 +- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/.github/workflows/docker-compose-test.yml b/.github/workflows/docker-compose-test.yml index 53c2196..1675815 100644 --- a/.github/workflows/docker-compose-test.yml +++ b/.github/workflows/docker-compose-test.yml @@ -51,17 +51,6 @@ jobs: echo "Redis test successful." fi - - name: Test MariaDB - run: | - sleep 5 - MYSQL_TEST=$(docker-compose exec -T mariadb mysql -u${{ secrets.MARIADB_USER }} -p${{ secrets.MARIADB_PASSWORD }} -e "SHOW DATABASES;") - if [[ ! "$MYSQL_TEST" =~ "${MARIADB_DATABASE}" ]]; then - echo "MariaDB test failed. Cannot show databases." - exit 1 - else - echo "MariaDB test successful." - fi - - name: Cleanup run: | docker-compose -f docker-compose.yml down diff --git a/README.md b/README.md index fc5edfb..9df80cb 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# Docker compose PHP 8.3.7, Xdebug 3.3.2, Nginx 1.26.0, Redis 7.2.4 and MariaDB 11.4.1-rc +# Docker compose PHP 8.3.8, Xdebug 3.4.0, Nginx 1.27.0, Redis 7.2.5 and MariaDB 11.4.2 ![docker](https://img.shields.io/badge/Docker-compose-brightgreen.svg) -![php](https://img.shields.io/badge/PHP_FPM-8.3.7-brightgreen.svg) +![php](https://img.shields.io/badge/PHP_FPM-8.3.8-brightgreen.svg) ![xdebug](https://img.shields.io/badge/Xdebug-3.3.2-brightgreen.svg) -![nginx](https://img.shields.io/badge/nginx-1.26.0-brightgreen.svg) -![redis](https://img.shields.io/badge/Redis-7.2.4-brightgreen.svg) -![mariadb](https://img.shields.io/badge/MariaDB-11.4.1-rc-brightgreen.svg) +![nginx](https://img.shields.io/badge/nginx-1.27.0-brightgreen.svg) +![redis](https://img.shields.io/badge/Redis-7.2.5-brightgreen.svg) +![mariadb](https://img.shields.io/badge/MariaDB-11.4.2-brightgreen.svg) * Easy setup with [docker-compose](https://docs.docker.com/compose/) and [Dockerfile](https://docs.docker.com/engine/reference/builder/) under usage from [Docker](https://www.docker.com) -* Uses [PHP 8.3.7](https://www.php.net) for better performance, lower CPU and memory usage +* Uses [PHP 8.3.8](https://www.php.net) for better performance, lower CPU and memory usage * And [composer the dependency manager for PHP](https://getcomposer.org) to start easy your project -* Built on the lightweight [nginx 1.26.0](https://nginx.org) webserver +* Built on the lightweight [nginx 1.27.0](https://nginx.org) webserver * Debugging with [Xdebug 3.3.2](https://xdebug.org) -* [Redis 7.2.4](https://redis.io) as session storage, database, cache, streaming engine, and message broker -* Database storage with [MariaDB 11.4.1-rc](https://mariadb.org) +* [Redis 7.2.5](https://redis.io) as session storage, database, cache, streaming engine, and message broker +* Database storage with [MariaDB 11.4.2](https://mariadb.org) See also: [Blog-Post: Dockerize your PHP application with Nginx and PHP8 FPM](https://marc.it/dockerize-application-with-nginx-and-php8/) diff --git a/docker-compose.yml b/docker-compose.yml index 580a50a..1b0036c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: nginx: - image: "nginx:1.26.0-alpine" + image: "nginx:1.27.0-alpine" restart: always working_dir: /app links: @@ -24,12 +24,12 @@ services: XDEBUG_MODE: "debug" redis: - image: "redis:7.2.4-alpine" + image: "redis:7.2.5-alpine" environment: ALLOW_EMPTY_PASSWORD: "yes" mariadb: - image: "mariadb:11.3.2" + image: "mariadb:11.4.2" restart: always working_dir: /app volumes: diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 4ef314d..4b42c79 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.7-fpm +FROM php:8.3.8-fpm WORKDIR "/app" # Update