From e5952176b7d7229ae84b7f27a3bdda6a787beb88 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 20 Jun 2021 10:33:37 +0200 Subject: [PATCH] push to php8 --- .gitlab-ci.yml | 4 ++-- Dockerfile | 2 +- README.md | 2 +- rootfs/etc/{php7 => php8}/php-fpm.conf | 0 rootfs/etc/services.d/php7-fpm/run | 3 --- rootfs/etc/services.d/php8-fpm/run | 3 +++ 6 files changed, 7 insertions(+), 7 deletions(-) rename rootfs/etc/{php7 => php8}/php-fpm.conf (100%) delete mode 100644 rootfs/etc/services.d/php7-fpm/run create mode 100644 rootfs/etc/services.d/php8-fpm/run diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfec3ce..6d00216 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,9 @@ stages: - trigger variables: - IMAGE_NAME: thallian/php7-fpm + IMAGE_NAME: thallian/php8-fpm CI_BUILD_ARCHS: "linux/amd64,linux/arm64" - DOWNSTREAM_PROJECTS: "49 51 52 54 85 107" + DOWNSTREAM_PROJECTS: "" build: stage: build diff --git a/Dockerfile b/Dockerfile index 32e9754..62a417e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM thallian/confd-env:latest -RUN apk --no-cache add php7-fpm +RUN apk --no-cache add php8-fpm ADD /rootfs / diff --git a/README.md b/README.md index 087b86e..65a157e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[php-fpm](https://php-fpm.org/) with PHP7. +[php-fpm](https://php-fpm.org/) with PHP8. # Environment Variables ## FPMUSER diff --git a/rootfs/etc/php7/php-fpm.conf b/rootfs/etc/php8/php-fpm.conf similarity index 100% rename from rootfs/etc/php7/php-fpm.conf rename to rootfs/etc/php8/php-fpm.conf diff --git a/rootfs/etc/services.d/php7-fpm/run b/rootfs/etc/services.d/php7-fpm/run deleted file mode 100644 index bc1e135..0000000 --- a/rootfs/etc/services.d/php7-fpm/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv sh - -exec php-fpm7 --nodaemonize --force-stderr diff --git a/rootfs/etc/services.d/php8-fpm/run b/rootfs/etc/services.d/php8-fpm/run new file mode 100644 index 0000000..cd167b0 --- /dev/null +++ b/rootfs/etc/services.d/php8-fpm/run @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv sh + +exec php-fpm8 --nodaemonize --force-stderr