Skip to content

Commit

Permalink
Removed PHP 7.3 and added PHP 8.1. 8.1 is now tag:latest (#6)
Browse files Browse the repository at this point in the history
* Removed PHP 7.3 and added PHP 8.1. 8.1 is now tag:latest

* updated build.yml

* Fixed merge conflict
  • Loading branch information
foorschtbar authored Nov 3, 2022
1 parent 5bc2f6b commit 6a7c7b8
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.3", "7.4", "8.0"]
php: ["7.4", "8.0", "8.1"]
python: ["python", "no-python"]
include:
- php: "7.4"
- php: "8.1"
python: "no-python"
tag_with_latest: true
tag_with_develop: true
- php: "7.4"
- php: "8.1"
python: "python"
tag_with_python: true

Expand Down Expand Up @@ -134,6 +134,7 @@ jobs:
steps:
- name: git checkout
uses: actions/checkout@v3

- name: push README to Dockerhub
uses: christian-korneck/update-container-description-action@v1
env:
Expand Down
73 changes: 36 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,52 @@
# php-webserver - A PHP Webserver #
# php-webserver - A PHP Webserver

[
![](https://img.shields.io/docker/v/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/pulls/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/stars/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/image-size/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/v/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/pulls/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/stars/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/docker/image-size/foorschtbar/php-webserver?style=plastic)
](https://hub.docker.com/repository/docker/foorschtbar/php-webserver)
[
![](https://img.shields.io/github/workflow/status/foorschtbar/php-webserver/Build%20Docker%20Images?style=plastic)
![](https://img.shields.io/github/languages/top/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/github/last-commit/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/github/license/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/github/workflow/status/foorschtbar/php-webserver/Build%20Docker%20Images?style=plastic)
![](https://img.shields.io/github/languages/top/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/github/last-commit/foorschtbar/php-webserver?style=plastic)
![](https://img.shields.io/github/license/foorschtbar/php-webserver?style=plastic)
](https://github.com/foorschtbar/php-webserver)

This is an usefull extension of the official php:\*-apache Docker image.

This is an usefull extension of the official php:*-apache Docker image.

* GitHub: [foorschtbar/php-webserver](https://github.com/foorschtbar/php-webserver)
* Docker Hub: [foorschtbar/php-webserver](https://hub.docker.com/r/foorschtbar/php-webserver)
- GitHub: [foorschtbar/php-webserver](https://github.com/foorschtbar/php-webserver)
- Docker Hub: [foorschtbar/php-webserver](https://hub.docker.com/r/foorschtbar/php-webserver)

## Improvements

... compared to the official image:

* PHP extensions: `mysqli`, `mysql_pdo`, `imap`, `soap`, `imagick` and `op_cache`
* Apache Modules: `mod_rewrite`, `mod_headers`, `mod_remoteip`
* Prepared for use behind a reverse proxy
* `Composer`
* `Python 3` (with extra Docker tag `python`)
- PHP extensions: `mysqli`, `mysql_pdo`, `imap`, `soap`, `imagick` and `op_cache`
- Apache Modules: `mod_rewrite`, `mod_headers`, `mod_remoteip`
- Prepared for use behind a reverse proxy
- `Composer`
- `Python 3` (with extra Docker tag `python`)

## Tags and Versions

Tag | PHP Version | Branch | Python
--- | --- | --- | ---
`latest` | 7.4 | master | no
`python` | 7.4 | master | yes
`develop` | 7.4 | develop | no
`7.3` | 7.3 | master | no
`7.3-develop` | 7.3 | develop | no
`7.3-python` | 7.3 | master | yes
`7.3-python-develop` | 7.3 | develop | yes
`7.4` | 7.4 | master | no
`7.4-develop` | 7.4 | develop | no
`7.4-python` | 7.4 | master | yes
`7.4-python-develop` | 7.4 | develop | yes
`8.0` | 8.0 | master | no
`8.0-develop` | 8.0 | develop | no
`8.0-python` | 8.0 | master | yes
`8.0-python-develop` | 8.0 | develop | yes
| Tag | PHP Version | Branch | Python |
| -------------------- | ----------- | ------- | ------ |
| `latest` | 8.1 | master | no |
| `python` | 8.1 | master | yes |
| `develop` | 8.1 | develop | no |
| `7.4` | 7.4 | master | no |
| `7.4-develop` | 7.4 | develop | no |
| `7.4-python` | 7.4 | master | yes |
| `7.4-python-develop` | 7.4 | develop | yes |
| `8.0` | 8.0 | master | no |
| `8.0-develop` | 8.0 | develop | no |
| `8.0-python` | 8.0 | master | yes |
| `8.0-python-develop` | 8.0 | develop | yes |
| `8.1` | 8.1 | master | no |
| `8.1-develop` | 8.1 | develop | no |
| `8.1-python` | 8.1 | master | yes |
| `8.1-python-develop` | 8.1 | develop | yes |

## Usage

Expand Down Expand Up @@ -82,7 +81,7 @@ services:
- reverse-proxy
depends_on:
- db

db:
image: mariadb
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
Expand All @@ -99,7 +98,7 @@ services:
- internal
ports:
- 127.0.0.1:<changeme>:3306
labels:
labels:
- "com.centurylinklabs.watchtower.enable=true"

networks:
Expand Down

0 comments on commit 6a7c7b8

Please sign in to comment.