From e4b6bc8eb8e8a97448bb1c52f0cf46953d20afcd Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@shopware.com>
Date: Sun, 7 Apr 2024 11:54:21 +0200
Subject: [PATCH] feat: add nginx base image

---
 .github/workflows/docker.yaml                 | 36 +++++++++++++++
 README.md                                     |  9 ++--
 examples/nginx-php-fpm/Dockerfile             | 18 --------
 examples/nginx-php-fpm/README.md              |  5 ---
 .../rootfs/etc/php/php-fpm.d/zz-user.conf     |  3 --
 examples/nginx-symfony-demo/Dockerfile        | 38 ++++++++++++++++
 examples/nginx-symfony-demo/README.md         | 12 +++++
 .../etc/php/php-fpm.d/zz-b-default.conf       |  2 +
 images/nginx/Dockerfile                       | 16 +++++++
 images/nginx/README.md                        | 44 +++++++++++++++++++
 .../nginx}/rootfs/etc/Procfile                |  0
 .../nginx}/rootfs/etc/nginx/nginx.conf        |  5 +++
 .../rootfs/var/www/html/public/index.php      |  0
 13 files changed, 158 insertions(+), 30 deletions(-)
 delete mode 100644 examples/nginx-php-fpm/Dockerfile
 delete mode 100644 examples/nginx-php-fpm/README.md
 delete mode 100644 examples/nginx-php-fpm/rootfs/etc/php/php-fpm.d/zz-user.conf
 create mode 100644 examples/nginx-symfony-demo/Dockerfile
 create mode 100644 examples/nginx-symfony-demo/README.md
 create mode 100644 images/nginx/Dockerfile
 create mode 100644 images/nginx/README.md
 rename {examples/nginx-php-fpm => images/nginx}/rootfs/etc/Procfile (100%)
 rename {examples/nginx-php-fpm => images/nginx}/rootfs/etc/nginx/nginx.conf (91%)
 rename {examples/nginx-php-fpm => images/nginx}/rootfs/var/www/html/public/index.php (100%)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 735f388..69a104a 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -116,3 +116,39 @@ jobs:
 
           - name: Sign image
             run: cosign sign --yes ghcr.io/shyim/wolfi-php/fpm:${{ matrix.php }}
+
+    nginx:
+      runs-on: ubuntu-latest
+      needs: fpm
+      strategy:
+        matrix:
+          php:
+            - 8.2
+            - 8.3
+      steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+
+          - name: Install Cosign
+            uses: sigstore/cosign-installer@v3
+
+          - name: Set up QEMU
+            uses: docker/setup-qemu-action@v3
+          
+          - name: Set up Docker Buildx
+            uses: docker/setup-buildx-action@v3
+
+          - name: Login into Github Docker Registery
+            run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+          - uses: docker/build-push-action@v5
+            with:
+              tags: ghcr.io/shyim/wolfi-php/nginx:${{ matrix.php }}
+              platforms: linux/amd64,linux/arm64
+              context: images/nginx
+              build-args: PHP_VERSION=${{ matrix.php }}
+              push: true
+              provenance: false
+
+          - name: Sign image
+            run: cosign sign --yes ghcr.io/shyim/wolfi-php/nginx:${{ matrix.php }}
diff --git a/README.md b/README.md
index 35beb7f..421a492 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,8 @@ To learn more about FrankenPHP, [see here](./images/frankenphp)
 We provide also base image for ready to start without touching configuration:
 
 - [FrankenPHP](./images/frankenphp)
-- [FPM](./images/fpm)
+- [Nginx + PHP-FPM](./images/nginx)
+- [FPM standalone](./images/fpm)
 
 ### Pinning package versions
 
@@ -119,6 +120,6 @@ To get the excact current version of a package, you can run `apk info php-8.2`.
 
 ## Examples
 
-- [Symfony Demo with FrankenPHP](examples/frankenphp-symfony-demo/README.md)
-- [Symfony demo with FPM](examples/fpm-symfony-demo/README.md)
-- [Nginx + PHP-FPM](examples/nginx-php-fpm/README.md)
+- [Symfony Demo with FrankenPHP](examples/frankenphp-symfony-demo/)
+- [Symfony Demo with FPM](examples/fpm-symfony-demo/)
+- [Symfony Demo with Nginx](examples/nginx-symfony-demo/)
diff --git a/examples/nginx-php-fpm/Dockerfile b/examples/nginx-php-fpm/Dockerfile
deleted file mode 100644
index 1fc5502..0000000
--- a/examples/nginx-php-fpm/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ghcr.io/shyim/wolfi-php/base:latest
-
-ARG PHP_VERSION=8.3
-
-RUN <<EOF 
-set -e
-apk add --no-cache \
-    overmind \
-    nginx \
-    php-${PHP_VERSION}-fpm
-adduser -u 82 www-data -D
-chown -R www-data:www-data /var/lib/nginx
-EOF
-
-USER www-data
-COPY rootfs /
-
-ENTRYPOINT ["/usr/bin/overmind", "start", "-f", "/etc/Procfile", "-s", "/tmp/overmind.sock"]
diff --git a/examples/nginx-php-fpm/README.md b/examples/nginx-php-fpm/README.md
deleted file mode 100644
index 1687489..0000000
--- a/examples/nginx-php-fpm/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# NGINX + PHP-FPM
-
-This example shows how to run a PHP-FPM server with Nginx inside the same container. To start both processes, we use overmind which is a Procfile-based process manager.
-
-For optimal performance, php-fpm and nginx are only talking with each other via unix sockets.
diff --git a/examples/nginx-php-fpm/rootfs/etc/php/php-fpm.d/zz-user.conf b/examples/nginx-php-fpm/rootfs/etc/php/php-fpm.d/zz-user.conf
deleted file mode 100644
index b62b95a..0000000
--- a/examples/nginx-php-fpm/rootfs/etc/php/php-fpm.d/zz-user.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[www]
-# we run in the same container, use unix_sockets to communicate, default is port 9000
-listen = /tmp/php-fpm.sock
diff --git a/examples/nginx-symfony-demo/Dockerfile b/examples/nginx-symfony-demo/Dockerfile
new file mode 100644
index 0000000..4cc4ea8
--- /dev/null
+++ b/examples/nginx-symfony-demo/Dockerfile
@@ -0,0 +1,38 @@
+# runtime dependencies
+FROM ghcr.io/shyim/wolfi-php/nginx:8.2 as base
+ENV APP_ENV=prod
+
+RUN apk add --no-cache \
+    php-8.2-intl \
+    php-8.2-simplexml \
+    php-8.2-iconv \
+    php-8.2-dom \
+    php-8.2-xml \
+    php-8.2-simplexml \
+    php-8.2-pdo \
+    php-8.2-pdo_sqlite
+
+# download symfony demo and build it
+FROM base as composer
+
+RUN apk add --no-cache \
+    git \
+    composer \
+    unzip \
+    php-8.2 \
+    php-8.2-curl \
+    php-8.2-openssl \
+    php-8.2-phar
+
+WORKDIR /app
+RUN git clone https://github.com/symfony/demo.git --depth=1 .
+RUN composer install
+RUN bin/console asset-map:compile
+RUN rm -rf .git
+
+# build final image
+
+FROM base
+
+# uid 82 is www-data
+COPY --from=composer --chown=82 /app /var/www/html
diff --git a/examples/nginx-symfony-demo/README.md b/examples/nginx-symfony-demo/README.md
new file mode 100644
index 0000000..7b3bbc1
--- /dev/null
+++ b/examples/nginx-symfony-demo/README.md
@@ -0,0 +1,12 @@
+# Symfony Demo with Nginx
+
+This is a Dockerfile to set up a Symfony Demo application with Nginx.
+
+This example is using this [Nginx image](../../images/nginx/).
+
+```bash
+docker build -t symfony-demo .
+docker run -p 8000:8000 symfony-demo
+```
+
+and then open http://localhost:8000 in your browser.
diff --git a/images/fpm/rootfs/etc/php/php-fpm.d/zz-b-default.conf b/images/fpm/rootfs/etc/php/php-fpm.d/zz-b-default.conf
index 44b7ecc..3dd81a3 100644
--- a/images/fpm/rootfs/etc/php/php-fpm.d/zz-b-default.conf
+++ b/images/fpm/rootfs/etc/php/php-fpm.d/zz-b-default.conf
@@ -2,6 +2,8 @@
 user = ${PHP_FPM_USER}
 group = ${PHP_FPM_GROUP}
 listen = ${PHP_FPM_LISTEN}
+listen.owner = ${PHP_FPM_USER}
+listen.group = ${PHP_FPM_GROUP}
 pm = ${PHP_FPM_PM}
 pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN}
 pm.start_servers = ${PHP_FPM_PM_START_SERVERS}
diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile
new file mode 100644
index 0000000..ed3a5a7
--- /dev/null
+++ b/images/nginx/Dockerfile
@@ -0,0 +1,16 @@
+ARG PHP_VERSION=8.3
+FROM ghcr.io/shyim/wolfi-php/fpm:${PHP_VERSION}
+
+ENV PHP_FPM_LISTEN=/tmp/php-fpm.sock
+
+RUN <<EOF
+set -eo pipefail
+apk add --no-cache \
+    overmind \
+    nginx
+EOF
+
+COPY --link rootfs /
+EXPOSE 8000
+
+ENTRYPOINT ["/usr/bin/overmind", "start", "-f", "/etc/Procfile", "-s", "/tmp/overmind.sock"]
diff --git a/images/nginx/README.md b/images/nginx/README.md
new file mode 100644
index 0000000..811bd1d
--- /dev/null
+++ b/images/nginx/README.md
@@ -0,0 +1,44 @@
+# Nginx + PHP-FPM
+
+This image contains Nginx and PHP-FPM in the same container. To run both processes in the same container, we use overmind a Procfile compatible process manager.
+
+## Usage
+
+```dockerfile
+FROM ghcr.io/shyim/wolfi-php/fpm:8.3
+
+# Install missing extensions
+RUN apk add --no-cache php-8.3-redis php-8.3-gd
+
+# Copy your files
+COPY . /var/www/html
+```
+
+```shell
+docker build -t my-image .
+docker run -p 8080:8080 my-image
+```
+
+You can run it for testing purposes also directly, `docker run --rm -p 8080:8080 ghcr.io/shyim/wolfi-php/fpm:8.3` and you should see at `http://localhost:8000` the php info page.
+
+## PHP Extensions / PHP Configuration
+
+As this image bases on [fpm](../fpm/), you can check out there how to configure PHP / PHP-FPM and install php extensions.
+
+## Overwrite Nginx Configuration
+
+You can overwrite the Nginx configuration by copying your own configuration to `/etc/nginx/nginx.conf`:
+
+```dockerfile
+COPY nginx.conf /etc/nginx/nginx.conf
+```
+
+You can find the default configuration [here](./rootfs/etc/nginx/nginx.conf).
+
+## Running rootless
+
+You can run the container as a non-root user. The image has a user `www-data` with UID 82. You can use it like this:
+
+```dockerfile
+USER www-data
+```
diff --git a/examples/nginx-php-fpm/rootfs/etc/Procfile b/images/nginx/rootfs/etc/Procfile
similarity index 100%
rename from examples/nginx-php-fpm/rootfs/etc/Procfile
rename to images/nginx/rootfs/etc/Procfile
diff --git a/examples/nginx-php-fpm/rootfs/etc/nginx/nginx.conf b/images/nginx/rootfs/etc/nginx/nginx.conf
similarity index 91%
rename from examples/nginx-php-fpm/rootfs/etc/nginx/nginx.conf
rename to images/nginx/rootfs/etc/nginx/nginx.conf
index 24895ac..ec47344 100644
--- a/examples/nginx-php-fpm/rootfs/etc/nginx/nginx.conf
+++ b/images/nginx/rootfs/etc/nginx/nginx.conf
@@ -1,6 +1,7 @@
 worker_processes auto;
 pid /tmp/nginx.pid;
 daemon off;
+user www-data;
 
 events {
     worker_connections  1024;
@@ -22,6 +23,10 @@ http {
         index  index.php;
         include /etc/nginx/mime.types;
 
+        location / {
+            try_files $uri /index.php$is_args$args;
+        }
+
         location ~ \.php$ {
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
             include fastcgi.conf;
diff --git a/examples/nginx-php-fpm/rootfs/var/www/html/public/index.php b/images/nginx/rootfs/var/www/html/public/index.php
similarity index 100%
rename from examples/nginx-php-fpm/rootfs/var/www/html/public/index.php
rename to images/nginx/rootfs/var/www/html/public/index.php