Skip to content

Commit a844226

Browse files
committed
More doc 📖
1 parent a31cab1 commit a844226

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

README.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
> Super simple Docker images for PHP development.
66
7-
**PHP Versions:** `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3`
7+
**PHP Versions:** `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3`, `7.4`
88

99
**PHP Variants:** `cli`, `fpm`
1010

@@ -26,7 +26,7 @@ $ docker pull jestefane/php-dev
2626
**Pull a specific version:**
2727

2828
```sh
29-
$ docker pull jestefane/php-dev:7.3-cli
29+
$ docker pull jestefane/php-dev:7.4-cli
3030
```
3131

3232
Pick between the various [images provided in this repository][images].
@@ -53,6 +53,7 @@ For convenience, the latest stable version/variant is also tagged as:
5353

5454
**Images names**:
5555

56+
- `jestefane/php-dev:7.4-cli`
5657
- `jestefane/php-dev:7.3-cli`
5758
- `jestefane/php-dev:7.2-cli`
5859
- `jestefane/php-dev:7.1-cli`
@@ -75,6 +76,7 @@ $ php-7.2-cli hello-world.php
7576

7677
**Images names**:
7778

79+
- `jestefane/php-dev:7.4-fpm`
7880
- `jestefane/php-dev:7.3-fpm`
7981
- `jestefane/php-dev:7.2-fpm`
8082
- `jestefane/php-dev:7.1-fpm`
@@ -87,7 +89,7 @@ $ php-7.2-cli hello-world.php
8789
**Example**:
8890

8991
```bash
90-
$ docker run jestefane/php-dev:7.3-fpm hello-world.php
92+
$ docker run jestefane/php-dev:7.4-fpm hello-world.php
9193

9294
# or using one of the provided shortcuts
9395
$ php-7.2-fpm hello-world.php
@@ -150,23 +152,23 @@ For more info on the `scripts` task [Makefile command reference][scripts-make].
150152

151153
Images: [All respective versions of the PHP CLI variant][cli]
152154

153-
Shortcuts: `php-5.5-cli`, `php-5.6-cli`, `php-7.0-cli`, `php-7.1-cli`, `php-7.2-cli`, `php-7.3-cli`
155+
Shortcuts: `php-5.5-cli`, `php-5.6-cli`, `php-7.0-cli`, `php-7.1-cli`, `php-7.2-cli`, `php-7.3-cli`, `php-7.4-cli`
154156

155157
Script template: [template/php.template][php-template]
156158

157159
#### PHP FPM
158160

159161
Images: [All respective versions of the PHP FPM variant][fpm]
160162

161-
Shortcuts: `php-5.5-fpm`, `php-5.6-fpm`, `php-7.0-fpm`, `php-7.1-fpm`, `php-7.2-fpm`, `php-7.3-cli`
163+
Shortcuts: `php-5.5-fpm`, `php-5.6-fpm`, `php-7.0-fpm`, `php-7.1-fpm`, `php-7.2-fpm`, `php-7.3-fpm`, `php-7.4-fpm`
162164

163165
Script template: [template/php.template][php-template]
164166

165167
#### Composer
166168

167169
Images: [All respective versions of `jestefane/php-dev` images][images] ([Composer][composer] is installed on every image)
168170

169-
Shortcuts: `composer-5.5`, `composer-5.6`, `composer-7.0`, `composer-7.1`, `composer-7.2`, `composer-7.3`
171+
Shortcuts: `composer-5.5`, `composer-5.6`, `composer-7.0`, `composer-7.1`, `composer-7.2`, `composer-7.3`, `composer-7.4`
170172

171173
Script template: [template/composer.template][composer-template]
172174

@@ -179,17 +181,17 @@ Script template: [template/composer.template][composer-template]
179181
| `SOURCE_BRANCH` | Appended to the image name.<br />[Docker Cloud variable][docker-cloud-variable] | Current Git branch: `git rev-parse --abbrev-ref HEAD` | Any `string` value |
180182
| `DOCKER_REPO` | The Dockerhub repository to perform the tasks against<br />[Docker Cloud variable][docker-cloud-variable] | `jestefane/php-dev` | A Dockerhub repository |
181183
| `DOCKER_TAG` | A combinaison of one PHP version and one PHP variant to perform a task only one image (for example `7.1-cli`)<br />[Docker Cloud variable][docker-cloud-variable] | Empty | Any `PHP_VERSION`-`PHP_VARIANT` combinaison |
182-
| `PHP_VERSIONS` | Space separated list of PHP versions to perform a task on. | `5.5 5.6 7.0 7.1 7.2 7.3` | Any combination from `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3` |
184+
| `PHP_VERSIONS` | Space separated list of PHP versions to perform a task on. | `5.5 5.6 7.0 7.1 7.2 7.3 7.4` | Any combination from `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3`, `7.4` |
183185
| `PHP_VARIANTS` | Space separated list of Docker build variants to perform a task on | `cli fpm` | `cli`, `fpm` |
184186
| `BIN_DIR` | Directory in your `PATH` where you would like to symlink the scripts | `/usr/local/bin` | Any path on your system. Preferaby one already in your `PATH` |
185187
| `SCRIPTS_DIR` | Directory where the scripts are generated (or removed). Relative to the repository's root | `scripts` | Any path on your system |
186188

187189
> **Note**: When overriding space separated values from the CLI, you have to escape spaces. For example in `bash` you can use `\` or wrap your values in `"`:
188190
>
189191
> ```sh
190-
> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2\ 7.3 PHP_VARIANTS=cli\ fpm
192+
> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2\ 7.3\ 7.4 PHP_VARIANTS=cli\ fpm
191193
> # or
192-
> $ make build PHP_VERSIONS="7.0 7.1 7.2 7.3" PHP_VARIANTS="cli fpm"
194+
> $ make build PHP_VERSIONS="7.0 7.1 7.2 7.3 7.4" PHP_VARIANTS="cli fpm"
193195
> ```
194196
195197
### Tasks

0 commit comments

Comments
 (0)