Skip to content

Commit f6d39f8

Browse files
committed
Fixes #8: Add PHP 7.3, drop PHP 7.0.
1 parent 9e98f08 commit f6d39f8

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ language: python
33
services: docker
44

55
env:
6+
- php_version: '7.3'
67
- php_version: '7.2'
78
- php_version: '7.1'
89
- php_version: '7.0'
@@ -39,7 +40,7 @@ after_success:
3940
docker push geerlingguy/php-apache:${php_version}.x
4041
4142
# Push latest tag if building latest version.
42-
if [[ "$php_version" == "7.2" ]]; then
43+
if [[ "$php_version" == "7.3" ]]; then
4344
docker tag geerlingguy/php-apache:${php_version} geerlingguy/php-apache:latest
4445
docker push geerlingguy/php-apache:latest
4546
fi

README.md

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

1313
Currently maintained versions include:
1414

15-
- `7.2`, `7.2.x`, `latest`: PHP 7.2.x
15+
- `7.3`, `7.3.x`, `latest`: PHP 7.3.x
16+
- `7.2`, `7.2.x`: PHP 7.2.x
1617
- `7.1`, `7.1.x`: PHP 7.1.x
17-
- `7.0`, `7.0.x`: PHP 7.0.x
1818
- `5.6`, `5.6.x`: PHP 5.6.x
1919

2020
## Standalone Usage
@@ -36,7 +36,6 @@ You can also wrap up that configuration in a `Dockerfile` and/or a `docker-compo
3636
restart: always
3737
# See 'Custom PHP codebase' for instructions for volumes.
3838
volumes: []
39-
command: ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
4039

4140
Then run:
4241

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

70-
Similarly, you can mount a PHP config file to the path `/etc/php/7.2/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.3/apache2/php.ini` (substitute whatever PHP version you're currently using in that path).
7170

7271
## Management with Ansible
7372

@@ -86,7 +85,7 @@ First, install Ansible role requirements:
8685

8786
Then, make sure Docker is running, and run the playbook to build the container:
8887

89-
ansible-playbook --extra-vars="@vars/7.2.yml" main.yml
88+
ansible-playbook --extra-vars="@vars/7.3.yml" main.yml
9089

9190
(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.
9291

main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
apache_remove_default_vhost: yes
1414

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

2121
# Handy utilities.

vars/7.0.yml

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

vars/7.3.yml

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

0 commit comments

Comments
 (0)