Skip to content

Commit d87eddf

Browse files
authored
fix: remove the Nginx Unit variant (the repository has been archived) (#382)
1 parent ff86f03 commit d87eddf

File tree

14 files changed

+64
-609
lines changed

14 files changed

+64
-609
lines changed

.github/workflows/build-all.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
get_github_latest_tag "composer/composer"
7171
get_github_latest_tag "just-containers/s6-overlay"
7272
get_github_latest_tag "mlocati/docker-php-extension-installer"
73-
get_github_latest_tag "nginx/unit"
7473
get_github_latest_tag "roadrunner-server/roadrunner"
7574
get_dockerhub_latest_sha "library/debian"
7675
get_dockerhub_latest_sha "library/alpine"
@@ -211,7 +210,6 @@ jobs:
211210
matrix:
212211
app:
213212
- with-f8p
214-
- with-unit
215213
with:
216214
app_name: ${{ matrix.app }}
217215
tag_prefix: ${{ needs.prepare.outputs.tag_prefix }}

.github/workflows/partial-build/02-servers.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- with-nginx
4747
- with-roadrunner
4848
- with-f8p
49-
- with-unit
5049
with:
5150
app_name: ${{ matrix.app }}
5251
tag_prefix: ${{ inputs.tag_prefix }}

README.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PHP Docker Images <!-- omit from toc -->
22
📦 Simplified PHP Docker images for effortless customization and extension setup.
33

4-
Our Docker images cover PHP versions from 5.6 to 8.5 (beta), available in CLI, ZTS, FPM, FPM/Apache2, FPM/Nginx, RoadRunner, FrankenPHP, and Nginx Unit variants. The Docker images are available for both Debian and Alpine versions.
4+
Our Docker images cover PHP versions from 5.6 to 8.5 (beta), available in CLI, ZTS, FPM, FPM/Apache2, FPM/Nginx, RoadRunner and FrankenPHP variants. The Docker images are available for both Debian and Alpine versions.
55

66
- Docker Hub: https://hub.docker.com/r/shinsenter/php
77
- GitHub Packages: https://code.shin.company/php/pkgs/container/php
@@ -40,7 +40,7 @@ These images facilitate the easy adjustment of PHP and PHP-FPM settings using en
4040
eliminating the need to rebuild images when making configuration changes.
4141

4242
These images also come with the latest version of [Composer](https://getcomposer.org)
43-
and popular web servers like [Apache2](https://httpd.apache.org), [Nginx](https://nginx.org), [RoadRunner](https://roadrunner.dev), [FrankenPHP](https://frankenphp.dev) or [Nginx Unit](https://unit.nginx.org).
43+
and popular web servers like [Apache2](https://httpd.apache.org), [Nginx](https://nginx.org), [RoadRunner](https://roadrunner.dev) or [FrankenPHP](https://frankenphp.dev).
4444
This setup allows for faster project initiation without additional installations.
4545

4646
> 🪶 Info: While built on the official PHP images and including more useful extensions,
@@ -52,7 +52,7 @@ This setup allows for faster project initiation without additional installations
5252
## Docker Image Variants
5353

5454
Our image tags cover PHP versions from 5.6 to 8.5 (beta),
55-
available in `cli`, `zts`, `fpm`, `fpm-nginx`, `fpm-apache`, `roadrunner`<sup>(1)</sup>, `frankenphp`<sup>(2)</sup>, and `unit-php`<sup>(3)</sup> variants. The Docker images are available for both Debian and Alpine versions.
55+
available in `cli`, `zts`, `fpm`, `fpm-nginx`, `fpm-apache`, `roadrunner`<sup>(1)</sup>, and `frankenphp`<sup>(2)</sup> variants. The Docker images are available for both Debian and Alpine versions.
5656

5757
Examples:
5858
- `shinsenter/php:7.2-cli`
@@ -62,11 +62,9 @@ Examples:
6262
- `shinsenter/php:8.1-fpm-nginx`
6363
- `shinsenter/php:8.2-roadrunner` <sup>(1)</sup>
6464
- `shinsenter/php:8.3-frankenphp` <sup>(2)</sup>
65-
- `shinsenter/php:8.4-unit-php` <sup>(3)</sup>
6665

6766
> <sup>(1)</sup>: PHP with RoadRunner server. The `roadrunner` variant supports PHP >= 8.0.<br>
6867
> <sup>(2)</sup>: FrankenPHP is still in BETA. The `frankenphp` variant supports PHP >= 8.2.<br>
69-
> <sup>(3)</sup>: PHP with Nginx Unit server. The `unit-php` variant supports PHP >= 7.4.
7068
7169
Explore all available tags on our [Docker Hub](https://hub.docker.com/r/shinsenter/php/tags).
7270

@@ -94,7 +92,7 @@ docker run -v ./myproject:/var/www/html -p 9000:9000 shinsenter/php:8.4-fpm
9492
```
9593

9694

97-
#### PHP-FPM + Nginx (or Apache, RoadRunner, FrankenPHP, Nginx Unit) <!-- omit from toc -->
95+
#### PHP-FPM + Nginx (or Apache, RoadRunner, FrankenPHP) <!-- omit from toc -->
9896

9997
```shell
10098
# with Nginx
@@ -108,9 +106,6 @@ docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-r
108106

109107
# with FrankenPHP
110108
docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-frankenphp
111-
112-
# with Nginx Unit
113-
docker run -v ./myproject:/var/www/html -p 80:80 -p 443:443 shinsenter/php:8.3-unit-php
114109
```
115110

116111

build/config.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ apply_app_rules() {
153153
PREFER_SERVER="nginx"
154154
BUILD_FROM_IMAGE="$DEFAULT_REPO/phpfpm-nginx"
155155
;;
156-
unit|nginx-unit)
157-
PREFER_SERVER="unit"
158-
BUILD_FROM_IMAGE="$DEFAULT_REPO/unit-php"
159-
;;
160156
f8p|frankenphp)
161157
PREFER_SERVER="frankenphp"
162158
BUILD_FROM_IMAGE="$DEFAULT_REPO/frankenphp"
@@ -287,17 +283,6 @@ case "$APP" in
287283
PHP_VARIANT="fpm$SUFFIX"
288284
ALLOW_RC=1
289285
;;
290-
with-unit)
291-
verlt "$PHP_VERSION" "7.4" && SKIP_BUILD=1
292-
unit_version="$(get_github_latest_tag nginx/unit)"
293-
PREFIX="unit"
294-
BUILD_NAME="$DEFAULT_REPO/unit-php"
295-
BUILD_DOCKERFILE="$BASE_DIR/src/php/with-unit.dockerfile"
296-
BUILD_SOURCE_IMAGE="https://codeload.github.com/nginx/unit/tar.gz/refs/tags/$unit_version"
297-
BUILD_CACHE_KEY="(unit@$(echo "$unit_version" | head -c19))"
298-
PHP_VARIANT="zts$SUFFIX"
299-
ALLOW_RC=1
300-
;;
301286
with-f8p)
302287
verlt "$PHP_VERSION" "8.2" && SKIP_BUILD=1
303288
PREFIX="frankenphp"
@@ -422,7 +407,6 @@ if [ -n "$PHP_VERSION" ]; then
422407
with-nginx) suffix=fpm-nginx ;;
423408
with-roadrunner) suffix=roadrunner ;;
424409
with-f8p) suffix=frankenphp ;;
425-
with-unit) suffix=unit-php ;;
426410
esac
427411

428412
[ -n "$suffix" ] && {

build/helpers.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ path_hash() {
163163

164164
# get_github_latest_tag "just-containers/s6-overlay"
165165
# get_github_latest_sha "just-containers/s6-overlay"
166-
# get_github_latest_tag "nginx/unit"
167-
# get_github_latest_sha "nginx/unit"
168166
# get_github_latest_tag "roadrunner-server/roadrunner"
169167
# get_github_latest_sha "roadrunner-server/roadrunner"
170168
# get_dockerhub_latest_tag "library/php"

src/php/with-unit.dockerfile

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/php/with-unit.md

Lines changed: 0 additions & 124 deletions
This file was deleted.

src/php/with-unit/rootfs/etc/hooks/server/init-unit

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)