Skip to content

Commit 249e0df

Browse files
committed
Add PHP 7.4 and make it latest.
1 parent 21568ad commit 249e0df

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ language: python
33
services: docker
44

55
env:
6+
- php_version: '7.4'
67
- php_version: '7.3'
78
- php_version: '7.2'
89
- php_version: '7.1'

README.md

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

1313
Currently maintained versions include:
1414

15-
- `7.3`, `7.3.x`, `latest`: PHP 7.3.x
15+
- `7.4`, `7.4.x`, `latest`: PHP 7.4.x
16+
- `7.3`, `7.3.x`: PHP 7.3.x
1617
- `7.2`, `7.2.x`: PHP 7.2.x
1718
- `7.1`, `7.1.x`: PHP 7.1.x
1819

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

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

7071
## Management with Ansible
7172

@@ -84,7 +85,7 @@ First, install Ansible role requirements:
8485

8586
Then, make sure Docker is running, and run the playbook to build the container:
8687

87-
ansible-playbook --extra-vars="@vars/7.3.yml" main.yml
88+
ansible-playbook --extra-vars="@vars/7.4.yml" main.yml
8889

8990
(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.
9091

docker-push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:${php_ve
1717
docker push geerlingguy/php-apache:${php_version}.${php_release_version}
1818

1919
# Push latest tag if building latest version.
20-
if [[ "$php_version" == "7.3" ]]; then
20+
if [[ "$php_version" == "7.4" ]]; then
2121
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:latest
2222
docker push geerlingguy/php-apache:latest
2323
fi

vars/7.4.yml

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

0 commit comments

Comments
 (0)