Skip to content

Commit 6c23135

Browse files
committed
Merge pull request #14 from drupal-docker/organize-readme
Update README.md
2 parents 16dea57 + b6fb219 commit 6c23135

1 file changed

Lines changed: 28 additions & 30 deletions

File tree

README.md

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
PHP for Drupal
2-
=============
3-
[![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=master)](https://travis-ci.org/drupal-docker/php)[![](https://badge.imagelayers.io/drupaldocker/php:latest.svg)](https://imagelayers.io/?images=drupaldocker/php:latest 'drupaldocker/php')
2+
=====================
3+
4+
- `5.4-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.4/Dockerfile))
5+
- `5.4-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.4/Dockerfile))
6+
- `5.4-fpm`, `5.4` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.4/Dockerfile))
7+
- `5.5-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.5/Dockerfile))
8+
- `5.5-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.5/Dockerfile))
9+
- `5.5-fpm`, `5.5` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.5/Dockerfile))
10+
- `5.6-cli`, `5-cli`, `cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.6/Dockerfile))
11+
- `5.6-apache`, `5-apache`, `apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.6/Dockerfile))
12+
- `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.6/Dockerfile))
13+
- `7.0-cli`, `7-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/7/Dockerfile))
14+
- `7.0-apache`, `7-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/7/Dockerfile))
15+
- `7.0-fpm`, `7-fpm`, `7.0`, `7` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/7/Dockerfile))
416

5-
Two flavors:
6-
- mod_php (with Apache included)
7-
- fpm
17+
[![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=master)](https://travis-ci.org/drupal-docker/php)[![](https://badge.imagelayers.io/drupaldocker/php:latest.svg)](https://imagelayers.io/?images=drupaldocker/php:latest 'drupaldocker/php')
818

919
# Quickstart:
1020

1121
PHP5.6 + Apache
1222
````
13-
docker run -dP --volume <path/to/drupal>:/var/www/html drupaldocker/php:apache
23+
docker run -dP drupaldocker/php:apache
1424
````
1525

16-
# Versions (Docker tags):
17-
- `5.4-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.4/Dockerfile))
18-
- `5.5-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.5/Dockerfile))
19-
- `5.6-apache`, `5-apache`, `apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/5.6/Dockerfile))
20-
- `7-apache` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/apache/7/Dockerfile))
21-
- `5.4-fpm`, `5.4` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.4/Dockerfile))
22-
- `5.5-fpm`, `5.5` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.5/Dockerfile))
23-
- `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/5.6/Dockerfile))
24-
- `7-fpm`, `7` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/fpm/7/Dockerfile))
25-
- `5.4-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.4/Dockerfile))
26-
- `5.5-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.5/Dockerfile))
27-
- `5.6-cli`, `5-cli`, `cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/5.6/Dockerfile))
28-
- `7-cli` ([Dockerfile](https://github.com/drupal-docker/php/blob/master/cli/7/Dockerfile))
26+
# Description
2927

30-
# Roadmap
31-
- ~~Add Dockerfiles for PHP + Apache (mod_php)~~
32-
- ~~Add Dockerfiles for PHP-FPM~~
33-
- ~~Make Apache powered images default ones~~
34-
- ~~Default version (latest): Apache + PHP5.6~~
35-
- ~~Make FPM _tags_ default (`5.6-fpm`, `5.6`, `latest`)~~
36-
- ~~Add php-cli~~
37-
- Update `latest` to php:7
28+
@todo
3829

3930
# Status
31+
4032
Proof of concept
4133

42-
# Contribution
43-
Create a pull request and become project maintainer :)
34+
# Contributing
35+
36+
1. Fork the repo
37+
1. Create your feature branch
38+
1. Commit your changes
39+
1. Push to the branch
40+
1. Create new Pull Request
41+
1. Wait for result of automate tests
4442

4543
# Credits
46-
"PHP for Drupal" images were built on the top of official [PHP images](https://hub.docker.com/r/_/php/). Big kudos to people from Docker community for official [Drupal image](https://hub.docker.com/r/_/drupal/).
44+
`drupaldocker/php images were built on the top of official [PHP images](https://hub.docker.com/r/_/php/). Big kudos to people from Docker community for official [Drupal image](https://hub.docker.com/r/_/drupal/).

0 commit comments

Comments
 (0)