Skip to content

Commit

Permalink
Merge pull request #520 from samdark/main
Browse files Browse the repository at this point in the history
Fix assorted typos
  • Loading branch information
shyim authored Oct 23, 2024
2 parents ec21cba + bc7154f commit bbc50a4
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bun-bin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/fpm-symfony-demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
8 changes: 4 additions & 4 deletions images/caddy/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions images/fpm/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FPM only image
# FPM-only image

## Image information

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions images/frankenphp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/nginx/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit bbc50a4

Please sign in to comment.