Skip to content

Commit

Permalink
Add more PHP versions
Browse files Browse the repository at this point in the history
  • Loading branch information
pjeby committed Mar 12, 2023
1 parent f444fc6 commit b28ea7a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/docker-hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ jobs:
- { php: "7.2.34", os: "3.12" }
- { php: "7.3.29", os: "3.14" }
- { php: "7.4.22", os: "3.14" }
- { php: "8.0.9", os: "3.14" }
- { php: "8.0.19", os: "3.14" }
- { php: "8.1.16", os: "3.16" }
- { php: "8.2.3", os: "3.16" }

steps:
# Use metadata action to get `major.minor` PHP version
- name: Get base PHP Version
id: phpver
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: ${{ github.repository }}
flavor: 'latest=false'
Expand All @@ -29,7 +31,7 @@ jobs:
# Compute tags for our patch version to go with
- name: Calculate Tags
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: ${{ github.repository }}
flavor: 'latest=false'
Expand All @@ -44,14 +46,14 @@ jobs:
type=raw,value=${{ steps.phpver.outputs.version }}
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
id: build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Trim README
run: |
sed -i -e 's~(#~(https://github.com/dirtsimple/php-server/#~; /tocstop/,/^#\+ Version Info/{/^#\+ Version Info/!d}' README.md
- name: Update repo description
uses: peter-evans/dockerhub-description@v2
uses: peter-evans/dockerhub-description@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ Also note that although you *can* just specify a PHP version, major releases of

### Major Versions

* 3.x - Alpine 3.10-3.14, Composer 2, PHP 7.1 through 8.0, dropped prestissimo from default `GLOBAL_REQUIRE`, added `--optimize-autoloader` to default `COMPOSER_OPTIONS`
* 3.x - Alpine 3.10-3.16, Composer 2, PHP 7.1 through 8.2, dropped prestissimo from default `GLOBAL_REQUIRE`, added `--optimize-autoloader` to default `COMPOSER_OPTIONS`
* 2.x - Alpine 3.9, Composer 1, PHP 7.1 through 7.3, build extensions using [mlocati/docker-php-extension-installer](https://github.com/mlocati/docker-php-extension-installer)
* 1.4.x - Alpine 3.9, Composer 1, PHP 7.1 and 7.2, image based on Docker php-fpm-alpine, scripted extension builds
* 1.3.x and older - Alpine 3.6, PHP 7.1 only, implemented as an overlay on the nginx-php-fpm image
Expand All @@ -320,7 +320,9 @@ Also note that although you *can* just specify a PHP version, major releases of

| Tags | PHP | nginx | mod lua | alpine | Notes |
| ------------- | ------ | ------ | ------- | ------ | ----- |
| 8.0-3.0.x | 8.0.9 | 1.20.1 | 0.10.19 | 3.14 |Composer 2|
| 8.2-3.0.x | 8.2.3 | 1.22.1 | 0.10.21 | 3.16 |Composer 2|
| 8.1-3.0.x | 8.1.16 | 1.22.1 | 0.10.21 | 3.16 ||
| 8.0-3.0.x | 8.0.19 | 1.20.1 | 0.10.19 | 3.14 ||
| 7.4-3.0.x | 7.4.22 | 1.20.1 | 0.10.19 | 3.14 ||
| 7.3-3.0.x | 7.3.29 | 1.20.1 | 0.10.19 | 3.14 ||
| 7.2-3.0.x | 7.2.34 | 1.18.0 | 0.10.15 | 3.12 ||
Expand Down

0 comments on commit b28ea7a

Please sign in to comment.