From bc7154ff89cff028937db687f4f2166349c7653a Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Wed, 23 Oct 2024 16:17:12 +0300 Subject: [PATCH] Fix assorted typos --- README.md | 4 ++-- bun-bin.yaml | 2 +- examples/fpm-symfony-demo/README.md | 2 +- images/caddy/README.md | 8 ++++---- images/fpm/README.md | 6 +++--- images/frankenphp/README.md | 8 ++++---- images/nginx/README.md | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 790e60f..f7ff497 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This Repository contains popular PHP extensions pre-compiled to be used in Wolfi-OS. [I am trying to upstream all packages to the official repository](https://github.com/wolfi-dev/os/pulls?q=+is%3Apr+author%3Ashyim+). The packages are all built for x86_64 and aarch64. A GitHub bot is automatically updating the packages and opens a new PR if a new version is available. -The repository is hosted with Cloudflare R2 storage and with good caching rules, so it should be fast world-wide. +The repository is hosted with Cloudflare R2 storage and with good caching rules, so it should be fast worldwide. ## Installation of Repository @@ -115,7 +115,7 @@ To pin the version of a package, you can specify the version in the `apk add` co apk add --no-cache php-8.2=8.2.17-r0 ``` -To get the excact current version of a package, you can run `apk info php-8.2`. +To get the exact current version of a package, you can run `apk info php-8.2`. ### Package updates diff --git a/bun-bin.yaml b/bun-bin.yaml index f9f265b..89b9616 100644 --- a/bun-bin.yaml +++ b/bun-bin.yaml @@ -2,7 +2,7 @@ package: name: bun-bin version: 1.1.32 epoch: 0 - description: "Bun binary distrubution" + description: "Bun binary distribution" copyright: - license: MIT options: diff --git a/examples/fpm-symfony-demo/README.md b/examples/fpm-symfony-demo/README.md index 09d5258..e4c1904 100644 --- a/examples/fpm-symfony-demo/README.md +++ b/examples/fpm-symfony-demo/README.md @@ -4,7 +4,7 @@ This example uses two containers to run a Symfony application with PHP-FPM and N The base fpm is can be [found here](../../images/fpm). -We build in the `Dockerfile` the PHP-FPM container and setup a small nginx container. +We build in the `Dockerfile` the PHP-FPM container and set up a small nginx container. The traffic is as follows: diff --git a/images/caddy/README.md b/images/caddy/README.md index 8e79b8e..02b9694 100644 --- a/images/caddy/README.md +++ b/images/caddy/README.md @@ -1,6 +1,6 @@ # Caddy + PHP-FPM -This image contains caddy and PHP-FPM in the same container. To run both processes in the same container, we use hivemind a Procfile compatible process manager. +This image contains caddy and PHP-FPM in the same container. To run both processes in the same container, we use hivemind, a Procfile compatible process manager. ## Usage @@ -28,9 +28,9 @@ As this image bases on [fpm](../fpm/), you can check out there how to configure ## Caddy Configuration - `SERVER_NAME` - The server name for Caddy. Default is `:8000` - This controls also the listing port of Caddy, use `:8000` as example for port `8000` -- `CADDY_GLOBAL_OPTIONS` - Allows to set global options for Caddy like: `debug` -- `CADDY_EXTRA_CONFIG` - Allows to set extra Caddy configuration like add new virtual host: `foo.com { root /app/public }` -- `CADDY_SERVER_EXTRA_DIRECTIVES` - Allows to set extra Caddy configuration for the default virtual host. [See here for all options](https://caddyserver.com/docs/caddyfile/directives) +- `CADDY_GLOBAL_OPTIONS` - Allows setting global options for Caddy like: `debug` +- `CADDY_EXTRA_CONFIG` - Allows setting extra Caddy configuration like add new virtual host: `foo.com { root /app/public }` +- `CADDY_SERVER_EXTRA_DIRECTIVES` - Allows setting extra Caddy configuration for the default virtual host. [See here for all options](https://caddyserver.com/docs/caddyfile/directives) ## Overwrite Caddy Configuration diff --git a/images/fpm/README.md b/images/fpm/README.md index d64eb81..2dc2f00 100644 --- a/images/fpm/README.md +++ b/images/fpm/README.md @@ -1,4 +1,4 @@ -# FPM only image +# FPM-only image ## Image information @@ -97,7 +97,7 @@ FROM ghcr.io/shyim/wolfi-php/fpm:8.3 COPY custom.ini /etc/php/conf.d/zz-custom.ini ``` -for FPM you can do the same with the path `/etc/php/php-fpm.d/zz-custom.conf`: +for FPM, you can do the same with the path `/etc/php/php-fpm.d/zz-custom.conf`: ```dockerfile FROM ghcr.io/shyim/wolfi-php/fpm:8.3 @@ -107,7 +107,7 @@ COPY custom.conf /etc/php/php-fpm.d/zz-custom.conf ## Running as non-root -The image is running as root by default. You can just need to switch the USER in the Dockerfile: +The image is running as root by default. You need to switch the USER in the Dockerfile: ```dockerfile USER www-data diff --git a/images/frankenphp/README.md b/images/frankenphp/README.md index 6eb5d91..37b3f75 100644 --- a/images/frankenphp/README.md +++ b/images/frankenphp/README.md @@ -31,10 +31,10 @@ docker run \ ## Available environment variables - `SERVER_NAME` - The server name for Caddy. Default is `localhost` - This controls also the listing port of Caddy, use `:8000` as example for port `8000` -- `FRANKENPHP_CONFIG` - Allows to set configuration for FrankenPHP specific like: `worker ./public/index.php` -- `CADDY_GLOBAL_OPTIONS` - Allows to set global options for Caddy like: `debug` -- `CADDY_EXTRA_CONFIG` - Allows to set extra Caddy configuration like add new virtual host: `foo.com { root /app/public }` -- `CADDY_SERVER_EXTRA_DIRECTIVES` - Allows to set extra Caddy configuration for the default virtual host. [See here for all options](https://caddyserver.com/docs/caddyfile/directives) +- `FRANKENPHP_CONFIG` - Allows setting configuration for FrankenPHP specific like: `worker ./public/index.php` +- `CADDY_GLOBAL_OPTIONS` - Allows setting global options for Caddy like: `debug` +- `CADDY_EXTRA_CONFIG` - Allows setting extra Caddy configuration like add new virtual host: `foo.com { root /app/public }` +- `CADDY_SERVER_EXTRA_DIRECTIVES` - Allows setting extra Caddy configuration for the default virtual host. [See here for all options](https://caddyserver.com/docs/caddyfile/directives) ## Rootless diff --git a/images/nginx/README.md b/images/nginx/README.md index 8196318..845ed97 100644 --- a/images/nginx/README.md +++ b/images/nginx/README.md @@ -1,6 +1,6 @@ # Nginx + PHP-FPM -This image contains Nginx and PHP-FPM in the same container. To run both processes in the same container, we use hivemind a Procfile compatible process manager. +This image contains Nginx and PHP-FPM in the same container. To run both processes in the same container, we use hivemind, a Procfile compatible process manager. ## Usage