From 6dfd15f7a9a524e0f7833addec8643960132c3f6 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:41:14 +0600 Subject: [PATCH 01/10] Fix ols auto build --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ea8344..a50558a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,8 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:qemu-v7.0.0-28 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 3beccea3387761153fd802175047e8a372830b92 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Tue, 18 Mar 2025 12:25:31 +0600 Subject: [PATCH 02/10] Fix deploy.yml --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d50e7f7..ab25731 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -85,6 +85,8 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:qemu-v7.0.0-28 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From de94fc7a002bd8488791705ad60fe3f3e5f96a84 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Thu, 20 Mar 2025 11:02:43 +0600 Subject: [PATCH 03/10] Remove php 7.4, Add php 8.3, Update OLS to latest --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/test.yml | 4 ++-- openlitespeed/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ab25731..de0015d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,14 +71,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php_version: ["7.4", "8.1", "8.2"] + php_version: ["8.1", "8.2", "8.3" ] include: - - php_version: "7.4" - lsphp: "lsphp74" - php_version: "8.1" lsphp: "lsphp81" - php_version: "8.2" lsphp: "lsphp82" + - php_version: "8.3" + lsphp: "lsphp83" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a50558a..0eacee2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,12 +52,12 @@ jobs: strategy: matrix: include: - - php_version: "7.4" - lsphp: "lsphp74" - php_version: "8.1" lsphp: "lsphp81" - php_version: "8.2" lsphp: "lsphp82" + - php_version: "8.3" + lsphp: "lsphp83" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/openlitespeed/Dockerfile b/openlitespeed/Dockerfile index 51e4f2a..cfee7a3 100644 --- a/openlitespeed/Dockerfile +++ b/openlitespeed/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:22.04 # Set ARGs for customization ARG PHP_VERSION=8.2 ARG LSPHP=lsphp82 -ARG OLS_VERSION=1.8.1 +ARG OLS_VERSION=1.8.3 ARG DEBIAN_FRONTEND=noninteractive ARG TARGETPLATFORM From 6dd9dcc15ebd05741bb80476b638dc800b2441ac Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Mon, 24 Mar 2025 13:49:19 +0600 Subject: [PATCH 04/10] test fix for php7.4 --- .github/workflows/deploy.yml | 4 +++- .github/workflows/test.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index de0015d..e137166 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,8 +71,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php_version: ["8.1", "8.2", "8.3" ] + php_version: ["7.4", "8.1", "8.2", "8.3" ] include: + - php_version: "7.4" + lsphp: "lsphp74" - php_version: "8.1" lsphp: "lsphp81" - php_version: "8.2" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0eacee2..f3f9260 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,6 +52,8 @@ jobs: strategy: matrix: include: + - php_version: "7.4" + lsphp: "lsphp74" - php_version: "8.1" lsphp: "lsphp81" - php_version: "8.2" From b424d97439dff146721e49bb5fef0b92017ce061 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Sun, 30 Mar 2025 10:26:44 +0600 Subject: [PATCH 05/10] feat: Add php 8.4 --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 2 +- README.MD | 8 +++++++- build.sh | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e137166..70506e4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php_version: ["7.4", "8.0", "8.1", "8.2", "8.3"] + php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3f9260..db3cc96 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php_version: ["7.4", "8.0", "8.1", "8.2", "8.3"] + php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/README.MD b/README.MD index 3565b8d..e09d110 100644 --- a/README.MD +++ b/README.MD @@ -11,6 +11,7 @@ Docker images for PHP-FPM. - PHP 8.1 - PHP 8.2 - PHP 8.3 +- PHP 8.4 ### Getting the images @@ -26,6 +27,9 @@ docker image pull meghsh/php:8.2 # PHP 8.3 docker image pull meghsh/php:8.3 + +# PHP 8.4 +docker image pull meghsh/php:8.4 ``` ### Using the images @@ -44,12 +48,14 @@ docker run --rm meghsh/php:8.2 bash -c "php -v" # PHP 8.3 docker run --rm meghsh/php:8.3 bash -c "php -v" + +# PHP 8.4 +docker run --rm meghsh/php:8.4 bash -c "php -v" ``` With docker-compose: ``` -version: "3.5" services: php: image: "meghsh/php:7.4" diff --git a/build.sh b/build.sh index 75fa019..08def95 100755 --- a/build.sh +++ b/build.sh @@ -7,3 +7,4 @@ docker build --platform linux/amd64,linux/arm64 --build-arg PHP_VERSION=8.0 -t m docker build --platform linux/amd64,linux/arm64 --build-arg PHP_VERSION=8.1 -t meghsh/php:8.1 -f php/Dockerfile php --push docker build --platform linux/amd64,linux/arm64 --build-arg PHP_VERSION=8.2 -t meghsh/php:8.2 -f php/Dockerfile php --push docker build --platform linux/amd64,linux/arm64 --build-arg PHP_VERSION=8.3 -t meghsh/php:8.3 -f php/Dockerfile php --push +docker build --platform linux/amd64,linux/arm64 --build-arg PHP_VERSION=8.4 -t meghsh/php:8.4 -f php/Dockerfile php --push From f4d231c18a3a7760637158bd56f45bee0864e063 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:04:30 +0600 Subject: [PATCH 06/10] fix(ols): OLS not handling high file count properly --- openlitespeed/entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/openlitespeed/entrypoint.sh b/openlitespeed/entrypoint.sh index 6a0796b..e9f1878 100644 --- a/openlitespeed/entrypoint.sh +++ b/openlitespeed/entrypoint.sh @@ -4,8 +4,6 @@ set -e # Ensure correct permissions chown -R www-data:www-data /var/www/html chown -R lsadm:lsadm /usr/local/lsws -find /var/www/html -type d -exec chmod 755 {} \; -find /var/www/html -type f -exec chmod 644 {} \; # Start OpenLiteSpeed echo "Starting OpenLiteSpeed..." From 4e13d3a4c0150f550f7fa5920f11490e39d0eca6 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:41:24 +0600 Subject: [PATCH 07/10] Revert "fix(ols): OLS not handling high file count properly" This reverts commit f4d231c18a3a7760637158bd56f45bee0864e063. --- openlitespeed/entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlitespeed/entrypoint.sh b/openlitespeed/entrypoint.sh index e9f1878..6a0796b 100644 --- a/openlitespeed/entrypoint.sh +++ b/openlitespeed/entrypoint.sh @@ -4,6 +4,8 @@ set -e # Ensure correct permissions chown -R www-data:www-data /var/www/html chown -R lsadm:lsadm /usr/local/lsws +find /var/www/html -type d -exec chmod 755 {} \; +find /var/www/html -type f -exec chmod 644 {} \; # Start OpenLiteSpeed echo "Starting OpenLiteSpeed..." From 124380c4698378a966ddc35b0bdf765332328c3f Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Wed, 25 Jun 2025 17:50:50 +0600 Subject: [PATCH 08/10] feat: Add php 8.4 support for OLS --- .github/workflows/deploy.yml | 4 +++- .github/workflows/test.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70506e4..2790ffc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,7 +71,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php_version: ["7.4", "8.1", "8.2", "8.3" ] + php_version: ["7.4", "8.1", "8.2", "8.3", "8.4" ] include: - php_version: "7.4" lsphp: "lsphp74" @@ -81,6 +81,8 @@ jobs: lsphp: "lsphp82" - php_version: "8.3" lsphp: "lsphp83" + - php_version: "8.4" + lsphp: "lsphp84" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db3cc96..c83c72d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,6 +60,8 @@ jobs: lsphp: "lsphp82" - php_version: "8.3" lsphp: "lsphp83" + - php_version: "8.4" + lsphp: "lsphp84" steps: - name: Checkout uses: actions/checkout@v4 From 83ecf7b8be075e9d67370b710cd7e32e40a34e27 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Wed, 6 Aug 2025 11:39:04 +0600 Subject: [PATCH 09/10] chore: upgrade OLS version --- openlitespeed/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlitespeed/Dockerfile b/openlitespeed/Dockerfile index 1e78678..b1efacc 100644 --- a/openlitespeed/Dockerfile +++ b/openlitespeed/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:22.04 # Set ARGs for customization ARG PHP_VERSION=8.2 ARG LSPHP=lsphp82 -ARG OLS_VERSION=1.8.3 +ARG OLS_VERSION=1.8.4.0 ARG DEBIAN_FRONTEND=noninteractive ARG TARGETPLATFORM From ec4e4ff9796bfc55b832b3b0ad121c02f193af92 Mon Sep 17 00:00:00 2001 From: ma-04 <120931948+ma-04@users.noreply.github.com> Date: Wed, 6 Aug 2025 11:49:24 +0600 Subject: [PATCH 10/10] fix: fix typo --- openlitespeed/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlitespeed/Dockerfile b/openlitespeed/Dockerfile index b1efacc..73b4379 100644 --- a/openlitespeed/Dockerfile +++ b/openlitespeed/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:22.04 # Set ARGs for customization ARG PHP_VERSION=8.2 ARG LSPHP=lsphp82 -ARG OLS_VERSION=1.8.4.0 +ARG OLS_VERSION=1.8.4 ARG DEBIAN_FRONTEND=noninteractive ARG TARGETPLATFORM