Skip to content

Commit 297a744

Browse files
committed
Drop PHP 7.x and add 8.3 and 8.2, switch to Bookworm.
1 parent 8446303 commit 297a744

File tree

9 files changed

+22
-36
lines changed

9 files changed

+22
-36
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ jobs:
2020
strategy:
2121
matrix:
2222
php_version:
23+
- '8.3'
24+
- '8.2'
2325
- '8.1'
24-
- '7.4'
25-
- '7.3'
26-
- '7.2'
27-
- '7.1'
2826

2927
steps:
3028
- uses: actions/checkout@v2
@@ -58,11 +56,9 @@ jobs:
5856
strategy:
5957
matrix:
6058
php_version:
59+
- '8.3'
60+
- '8.2'
6161
- '8.1'
62-
- '7.4'
63-
- '7.3'
64-
- '7.2'
65-
- '7.1'
6662
needs: test
6763
if: github.ref == 'refs/heads/master'
6864

@@ -104,7 +100,7 @@ jobs:
104100
docker push geerlingguy/php-apache:${{ matrix.php_version }}.${php_release_version}
105101
106102
# Push latest tag if building latest version.
107-
if [[ "${{ matrix.php_version }}" == "8.1" ]]; then
103+
if [[ "${{ matrix.php_version }}" == "8.3" ]]; then
108104
docker tag geerlingguy/php-apache:${{ matrix.php_version }} geerlingguy/php-apache:latest
109105
docker push geerlingguy/php-apache:latest
110106
fi

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ This project is composed of three main parts:
1212

1313
Currently maintained versions include:
1414

15-
- `8.1`, `8.1.x`, `latest`: PHP 8.1.x
16-
- `7.4`, `7.4.x`: PHP 7.4.x
17-
- `7.3`, `7.3.x`: PHP 7.3.x
18-
- `7.2`, `7.2.x`: PHP 7.2.x
19-
- `7.1`, `7.1.x`: PHP 7.1.x
15+
- `8.3`, `8.3.x`, `latest`: PHP 8.3.x
16+
- `8.2`, `8.2.x`: PHP 8.2.x
17+
- `8.1`, `8.1.x`: PHP 8.1.x
2018

2119
## Standalone Usage
2220

@@ -67,7 +65,7 @@ If you want to run multiple webroots, or need to further customize the Apache Vi
6765
- ./web:/var/www/html:rw,delegated
6866
- ./virtualhosts.conf:/etc/apache2/sites-enabled/vhosts.conf:rw
6967

70-
Similarly, you can mount a PHP config file to the path `/etc/php/8.1/apache2/php.ini` (substitute whatever PHP version you're currently using in that path).
68+
Similarly, you can mount a PHP config file to the path `/etc/php/8.3/apache2/php.ini` (substitute whatever PHP version you're currently using in that path).
7169

7270
## Management with Ansible
7371

@@ -86,7 +84,7 @@ First, install Ansible role requirements:
8684

8785
Then, make sure Docker is running, and run the playbook to build the container:
8886

89-
ansible-playbook --extra-vars="@vars/8.1.yml" main.yml
87+
ansible-playbook --extra-vars="@vars/8.2.yml" main.yml
9088

9189
(Substitute whatever supported PHP version you desire in the vars path) Once the image is built, you can run `docker images` to see the `php-apache` image that was generated.
9290

main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
base_image: debian:buster
7+
base_image: debian:bookworm
88
container_name: php_apache_build_container
99
image_namespace: geerlingguy
1010
image_name: php-apache
@@ -13,9 +13,9 @@
1313
apache_remove_default_vhost: yes
1414

1515
# PHP settings.
16-
php_version: '7.3'
16+
php_version: '8.3'
1717
php_packages_extra:
18-
- libapache2-mod-php7.3
18+
- libapache2-mod-php8.3
1919
php_install_recommends: no
2020

2121
# Handy utilities.
@@ -46,7 +46,7 @@
4646
- name: Ensure Python is installed.
4747
raw: >
4848
apt-get update &&
49-
apt-get install -y --no-install-recommends python
49+
apt-get install -y --no-install-recommends python3
5050
delegate_to: '{{ container_name }}'
5151

5252
- name: Gather facts inside the container.

vars/7.1.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

vars/7.2.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

vars/7.3.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

vars/7.4.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

vars/8.2.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
php_version: '8.2'
3+
php_packages_extra:
4+
- libapache2-mod-php8.2

vars/8.3.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
php_version: '8.3'
3+
php_packages_extra:
4+
- libapache2-mod-php8.3

0 commit comments

Comments
 (0)