Merge pull request #7 from grimzy/php-7.3

Added PHP 5.3 and made it latest

Author: grimzy

CHANGELOG.md

@@ -8,6 +8,12 @@ This project adheres to [Semantic Versioning][semver].
 
 Refer to master branch
 
+## \[v1.1.3\] - 2019-10-19
+
+### PHP version 7.3:
+- Added PHP version 7.3
+- Set new latest default to PHP 7.3
+
 ## \[v1.1.2\] - 2019-10-19
 
 ### Refactor Hooks into Functions:

Makefile

@@ -4,8 +4,8 @@ SOURCE_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 DOCKER_REPO=jestefane/php-dev
 DOCKER_TAG=
 
-# Possible PHP versions: 5.5, 5.6, 7.0, 7.1, 7.2
-PHP_VERSIONS=5.5 5.6 7.0 7.1 7.2
+# Possible PHP versions: 5.5, 5.6, 7.0, 7.1, 7.2, 7.3
+PHP_VERSIONS=5.5 5.6 7.0 7.1 7.2 7.3
 
 # Possible PHP variants: cli, fpm
 PHP_VARIANTS=cli fpm

README.md

@@ -4,7 +4,7 @@
 
 >  Super simple Docker images for PHP development.
 
-**PHP Versions:** `5.5`, `5.6`, `7.0`, `7.1`, `7.2`
+**PHP Versions:** `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3`
 
 **PHP Variants:** `cli`, `fpm`
 
@@ -26,7 +26,7 @@ $ docker pull jestefane/php-dev
 **Pull a specific version:**
 
 ```sh
-$ docker pull jestefane/php-dev:7.2-cli
+$ docker pull jestefane/php-dev:7.3-cli
 ```
 
 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:
 
 **Images names**:
 
+- `jestefane/php-dev:7.3-cli`
 - `jestefane/php-dev:7.2-cli`
 - `jestefane/php-dev:7.1-cli`
 - `jestefane/php-dev:7.0-cli`
@@ -74,18 +75,19 @@ $ php-7.2-cli hello-world.php
 
 **Images names**:
 
-- `jestefane/php-dev:5.5-fpm`
-- `jestefane/php-dev:5.6-fpm`
-- `jestefane/php-dev:7.0-fpm`
-- `jestefane/php-dev:7.1-fpm`
+- `jestefane/php-dev:7.3-fpm`
 - `jestefane/php-dev:7.2-fpm`
+- `jestefane/php-dev:7.1-fpm`
+- `jestefane/php-dev:7.0-fpm`
+- `jestefane/php-dev:5.6-fpm`
+- `jestefane/php-dev:5.5-fpm`
 
 **Shortcuts**: [`php-fpm`][php-fpm-ref]
 
 **Example**:
 
 ```bash
-$ docker run jestefane/php-dev:7.2-fpm hello-world.php
+$ docker run jestefane/php-dev:7.3-fpm hello-world.php
 
 # or using one of the provided shortcuts
 $ php-7.2-fpm hello-world.php
@@ -148,23 +150,23 @@ For more info on the `scripts` task [Makefile command reference][scripts-make].
 
 Images: [All respective versions of the PHP CLI variant][cli]
 
-Shortcuts: `php-5.5-cli`, `php-5.6-cli`, `php-7.0-cli`, `php-7.1-cli`, `php-7.2-cli`
+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`
 
 Script template: [template/php.template][php-template]
 
 #### PHP FPM
 
 Images: [All respective versions of the PHP FPM variant][fpm]
 
-Shortcuts: `php-5.5-fpm`, `php-5.6-fpm`, `php-7.0-fpm`, `php-7.1-fpm`, `php-7.2-fpm`
+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`
 
 Script template: [template/php.template][php-template]
 
 #### Composer
 
 Images: [All respective versions of `jestefane/php-dev` images][images] ([Composer][composer] is installed on every image)
 
-Shortcuts: `composer-5.5`, `composer-5.6`, `composer-7.0`, `composer-7.1`, `composer-7.2`
+Shortcuts: `composer-5.5`, `composer-5.6`, `composer-7.0`, `composer-7.1`, `composer-7.2`, `composer-7.3`
 
 Script template: [template/composer.template][composer-template]
 
@@ -177,17 +179,17 @@ Script template: [template/composer.template][composer-template]
 | `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                                           |
 | `DOCKER_REPO`   | The Dockerhub repository to perform the tasks against<br />[Docker Cloud variable][docker-cloud-variable] | `jestefane/php-dev`                                   | A Dockerhub repository                                       |
 | `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                  |
-| `PHP_VERSIONS`  | Space separated list of PHP versions to perform a task on.   | `5.5 5.6 7.0 7.1 7.2`                                 | Any combination from `5.5`, `5.6`, `7.0`, `7.1`, `7.2`       |
+| `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` |
 | `PHP_VARIANTS`  | Space separated list of Docker build variants to perform a task on | `cli fpm`                                             | `cli`, `fpm`                                                 |
 | `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` |
 | `SCRIPTS_DIR`   | Directory where the scripts are generated (or removed). Relative to the repository's root | `scripts`                                             | Any path on your system                                      |
 
 > **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 `"`:
 >
 > ```sh
-> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2 PHP_VARIANTS=cli\ fpm
+> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2\ 7.3 PHP_VARIANTS=cli\ fpm
 > # or
-> $ make build PHP_VERSIONS="7.0 7.1 7.2" PHP_VARIANTS="cli fpm"
+> $ make build PHP_VERSIONS="7.0 7.1 7.2 7.3" PHP_VARIANTS="cli fpm"
 > ```
 
 ### Tasks

build/Dockerfile

@@ -1,5 +1,5 @@
 # PHP version and variant to build (defaults are latest)
-ARG BUILD_PHP_VERSION=7.2
+ARG BUILD_PHP_VERSION=7.3
 ARG BUILD_PHP_VARIANT=cli
 
 FROM php:$BUILD_PHP_VERSION-$BUILD_PHP_VARIANT

build/hooks/post_push

@@ -47,7 +47,7 @@ function isRelease() {
 }
 
 function isLatest() {
-  local latest_version=7.2
+  local latest_version=7.3
   local latest_variant=cli
   [ "$php_version" == "$latest_version" ] && [ "$php_variant" == "$latest_variant" ]
 }