Skip to content

Commit a2a51e7

Browse files
authored
Merge branch 'master' into improve-structure
2 parents 3684b3b + 5517062 commit a2a51e7

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ Version | Type | Tags | Dockerfile
1212
5.5 (deprecated) | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/apache/Dockerfile)
1313
5.5 (deprecated) | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/fpm/Dockerfile)
1414
5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile)
15+
| | `5.6-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6-alpine/Dockerfile)
1516
5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/apache/Dockerfile)
1617
5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/fpm/Dockerfile)
18+
| | `5.6-alpine-fpm`, `5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6-alpine/fpm/Dockerfile)
1719
7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/Dockerfile)
20+
| | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0-alpine/Dockerfile)
1821
7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/apache/Dockerfile)
1922
7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/fpm/Dockerfile)
23+
| | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0-alpine/fpm/Dockerfile)
2024
7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile)
25+
| | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1-alpine/Dockerfile)
2126
7.1 | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/apache/Dockerfile)
2227
7.1 | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/fpm/Dockerfile)
28+
| | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1-alpine/fpm/Dockerfile)
2329

2430
**Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016**
2531

0 commit comments

Comments
 (0)