Merge pull request #3 from grimzy/php-fpm

PHP FPM

Author: grimzy

CHANGELOG.md

@@ -10,9 +10,11 @@ Refer to master branch
 
 ## \[v1.1.1\] - 2019-10-13
 
-### Split PHP builds:
+### Split PHP builds, PHP FPM:
 - Split builds by PHP version and variant
 - Use builds Docker hooks in Makefile
+- Added `fpm` variant
+- Now using `DOCKER_REPO` and `DOCKER_TAG` build variables
 
 ## \[v1.1.0\] - 2019-10-13
 

Makefile

@@ -1,14 +1,16 @@
 # SOURCE_BRANCH
-SOURCE_BRANCH=1.1.0
+SOURCE_BRANCH=1.1.1
 
-# DOCKER_TAG
+# DOCKER_REPO and DOCKER_TAG:
+# https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks
+DOCKER_REPO=jestefane/php-dev
 DOCKER_TAG=
 
 # Possible versions: 5.5 5.6 7.0 7.1 7.2
 PHP_VERSIONS=5.5 5.6 7.0 7.1 7.2
 
 # Possible VARIANT: cli, fpm, apache, alpine
-PHP_VARIANTS=cli
+PHP_VARIANTS=cli fpm
 
 BIN_DIR=/usr/local/bin
 SCRIPTS_DIR=scripts
@@ -18,6 +20,7 @@ build:
 	@PHP_VERSIONS="$(PHP_VERSIONS)" \
 	PHP_VARIANTS="$(PHP_VARIANTS)" \
 	SOURCE_BRANCH="$(SOURCE_BRANCH)" \
+	DOCKER_REPO="$(DOCKER_REPO)" \
 	DOCKER_TAG="$(DOCKER_TAG)" \
 	./build/hooks/build
 
@@ -26,6 +29,7 @@ post_push:
 	@PHP_VERSIONS="$(PHP_VERSIONS)" \
 	PHP_VARIANTS="$(PHP_VARIANTS)" \
 	SOURCE_BRANCH="$(SOURCE_BRANCH)" \
+	DOCKER_REPO="$(DOCKER_REPO)" \
 	DOCKER_TAG="$(DOCKER_TAG)" \
 	./build/hooks/post_push
 
@@ -34,7 +38,7 @@ rm_build:
 	@{ \
 	for php_version in $(PHP_VERSIONS); do \
 		for php_variant in $(PHP_VARIANTS); do \
-			image_name=jestefane/php-dev:$$php_version-$$php_variant-$(SOURCE_BRANCH); \
+			image_name=$(DOCKER_REPO):$$php_version-$$php_variant-$(SOURCE_BRANCH); \
 			echo Removing image: $$image_name; \
 			docker rmi $$image_name || true; \
 		done; \
@@ -53,7 +57,7 @@ scripts: rm_scripts_dir
 			regex=s!%%PHP_VERSION%%!$$php_version!g\;s!%%PHP_VARIANT%%!$$php_variant!g\;s!%%SOURCE_BRANCH%%!$(SOURCE_BRANCH)!g; \
 			mkdir -p $(SCRIPTS_DIR); \
 			echo ">>> Script: PHP $$php_version-$$php_variant"; \
-			sed $$regex template/php-cli.template > $(SCRIPTS_DIR)/php-$$php_version-$$php_variant; \
+			sed $$regex template/php.template > $(SCRIPTS_DIR)/php-$$php_version-$$php_variant; \
 		done; \
 		echo ">>> Script Composer $$php_version"; \
 		sed $$regex template/composer.template > $(SCRIPTS_DIR)/composer-$$php_version; \
@@ -93,5 +97,3 @@ rm_dangling:
 	@docker volume ls -qf dangling=true | xargs docker volume rm
 	@echo Removing dangling images
 	@docker images -qf dangling=true | xargs docker rmi
-
-#TODO: aliasing shortcuts to get the defaults php php-fpm and composer

README.md

@@ -1,12 +1,12 @@
-# PHP Development Docker Images
+#### PHP Development Docker Images
 
-![Docker Cloud Automated build][docker-cloud-automated] ![Docker Cloud Build Status][docker-cloud-build] ![Docker Pulls][docker-pulls] ![Docker Stars][docker-stars] ![MicroBadger Layers][microbadger-layers] ![MicroBadger Size][microbadger-image-size]
+[![Docker Cloud Automated build][docker-cloud-automated]][docker-builds] [![Docker Cloud Build Status][docker-cloud-build]][docker-builds] [![Docker Pulls][docker-pulls]][docker-overview] [![Docker Stars][docker-stars]][docker-overview] [![MicroBadger Layers][microbadger-layers]][docker-overview] [![MicroBadger Size][microbadger-image-size]][docker-overview]
 
 >  Super simple Docker images for PHP development.
 
 **PHP Versions:** `5.5`, `5.6`, `7.0`, `7.1`, `7.2`
 
-**PHP Variants:** `cli`
+**PHP Variants:** `cli`, `fpm`
 
 **Images based on the** [Official PHP Images][docker-php]
 
@@ -26,7 +26,7 @@ $ docker pull jestefane/php-dev
 **Pull a specific version:**
 
 ```sh
-$ docker pull jestefane/php-dev:7.2-cli-1.1.0
+$ docker pull jestefane/php-dev:7.2-cli-1.1.1
 ```
 
 Pick between the various [images provided in this repository][images].
@@ -47,23 +47,44 @@ To use the Docker images more like binaries, we're providing [Shortcuts][shortcu
 
 **Images names**:
 
-- `jestefane/php-dev:5.5-cli-1.1.0`
-- `jestefane/php-dev:5.6-cli-1.1.0`
-- `jestefane/php-dev:7.0-cli-1.1.0`
-- `jestefane/php-dev:7.1-cli-1.1.0`
-- `jestefane/php-dev:7.2-cli-1.1.0`
+- `jestefane/php-dev:5.5-cli-1.1.1`
+- `jestefane/php-dev:5.6-cli-1.1.1`
+- `jestefane/php-dev:7.0-cli-1.1.1`
+- `jestefane/php-dev:7.1-cli-1.1.1`
+- `jestefane/php-dev:7.2-cli-1.1.1`
 
 **Shortcuts**: [`php-cli`][php-cli-ref], [`composer`][composer-ref]
 
 **Example**:
 
 ```bash
-$ docker run jestefane/php-dev:7.2-cli-1.1.0 hello-world.php
+$ docker run jestefane/php-dev:7.2-cli-1.1.1 hello-world.php
 
 # or using one of the provided shortcuts
 $ php-7.2-cli hello-world.php
 ```
 
+### FPM
+
+**Images names**:
+
+- `jestefane/php-dev:5.5-fpm-1.1.1`
+- `jestefane/php-dev:5.6-fpm-1.1.1`
+- `jestefane/php-dev:7.0-fpm-1.1.1`
+- `jestefane/php-dev:7.1-fpm-1.1.1`
+- `jestefane/php-dev:7.2-fpm-1.1.1`
+
+**Shortcuts**: [`php-fpm`][php-fpm-ref]
+
+**Example**:
+
+```bash
+$ docker run jestefane/php-dev:7.2-fpm-1.1.1 hello-world.php
+
+# or using one of the provided shortcuts
+$ php-7.2-fpm hello-world.php
+```
+
 ## Shortcuts
 
 > **Note**: Only tested on some distros of Linux and Mac OS. But hey! It's tested ;)
@@ -90,6 +111,20 @@ This generates `bash` scripts in the `scripts` directory (via. [Script Template]
 
 For more info on the `shortcuts` task, please checkout the [Makefile command reference][shortcuts-make].
 
+#### Aliasing your Preferred Version Shortucts
+
+Optionally, you can alias your preferred shortcuts by adding them to your `~/.bash_profile`:
+
+```sh
+# Aliases for the jestefane/php-dev preferred versions
+alias php="php-7.2-cli"
+alias composer="composer-7.2"
+```
+
+> **Note**: this is not a perfect replacement for installing PHP on your system.
+
+> After saving your `.bash_profile`, don't forget to source your changes (`. ~/.bash_profile`) for them to take effect. Alternatively open a new Terminal session.
+
 #### Script Templates
 
 You'll notice that the directory that should contain the scripts doesn't exist; that's because you first need to generate them. This is automatically done prior to creating the symlinks. But if you've deleted a script or changed the templates in some way, you can regenerate scripts with:
@@ -105,48 +140,58 @@ For more info on the `scripts` task [Makefile command reference][scripts-make].
 
 #### PHP CLI
 
-**Images**: [All respective versions of the PHP CLI variant][cli]
+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`
+Script template: [template/php.template][php-template]
 
-**Script template**: [template/php-cli.template][php-cli-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`
+
+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)
+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`
 
-**Script template**: [template/composer.template][composer-template]
+Script template: [template/composer.template][composer-template]
 
 ## Makefile Commands Reference
 
 ### Variables
 
 | Variable name   | Description                                                  | Default value                         | Possible values                                              |
 | --------------- | ------------------------------------------------------------ | ------------------------------------- | ------------------------------------------------------------ |
-| `SOURCE_BRANCH` | Appended to the image name                                   | Repository's current version: `1.1.0` | Any `string` value                                           |
+| `SOURCE_BRANCH` | Appended to the image name                                   | Repository's current version: `1.1.1` | Any `string` value                                           |
+| `DOCKER_REPO`   | The Dockerhub repository to perform the tasks against        | `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`) | 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_VARIANTS`  | Space separated list of Docker build variants to perform a task on | `cli`                                 | `cli`                                                        |
+| `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 use `\`:
 >
 > ```sh
-> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2
+> $ make build PHP_VERSIONS=7.0\ 7.1\ 7.2 PHP_VARIANTS=cli\ fpm
 > ```
 
 ### Tasks
 
 #### Build the Images
 
-Locally builds all images from all possible combinations of `PHP_VERSIONS` and `PHP_VARIANTS`. `SOURCE_BRANCH` is appended to the image name.
+Locally builds all images from all possible combinations of `PHP_VERSIONS` and `PHP_VARIANTS`. `SOURCE_BRANCH` is appended to the image name. The `DOCKER_TAG` is used to target a specific PHP version and variant.
 
 **Command:** 
 
 ```sh
-$ make build [PHP_VERSIONS=] [PHP_VARIANTS=] [SOURCE_BRANCH=]
+$ make build [PHP_VERSIONS=] [PHP_VARIANTS=] [SOURCE_BRANCH=] [DOCKER_TAG=] [DOCKER_REPO=]
 ```
 
 #### Remove the Images
@@ -156,7 +201,7 @@ Remove all locally cached images from all possible combinations of `PHP_VERSIONS
 **Command:**
 
 ```sh
-$ make rm_build [PHP_VERSIONS=] [PHP_VARIANTS=] [SOURCE_BRANCH=]
+$ make rm_build [PHP_VERSIONS=] [PHP_VARIANTS=] [SOURCE_BRANCH=] [DOCKER_REPO=]
 ```
 
 #### Rebuild the Images
@@ -209,6 +254,18 @@ This task removes this repository's scripts' symlinks from the `BIN_DIR`.
 $ make rm_shortcuts [PHP_VERSIONS=] [PHP_VARIANTS=] [BIN_DIR=]
 ```
 
+#### Post Push
+
+Pushes the images to Dockerhub.
+
+> Truly, only used when developing to make sure that the Autobuild `post_push` hook works properly.
+
+**Command:**
+
+```sh
+make post_push [PHP_VERSIONS=] [PHP_VARIANTS=] [SOURCE_BRANCH=] [DOCKER_TAG=] [DOCKER_REPO=]
+```
+
 #### Remove Dangling Volumes and Images
 
 > **Warning**: Running this task will remove **any** dangling volume and image on your system; not just the ones provided.
@@ -228,19 +285,23 @@ $ make rm_dangling
 [docker-cloud-build]: https://img.shields.io/docker/cloud/build/jestefane/php-dev "Docker Cloud Build Status"
 [docker-pulls]: https://img.shields.io/docker/pulls/jestefane/php-dev "Docker Pulls"
 [docker-stars]: https://img.shields.io/docker/stars/jestefane/php-dev "Docker Stars"
-[microbadger-layers]: https://img.shields.io/microbadger/layers/jestefane/php-dev/7.2-cli-args-in-build "MicroBadger Layers"
-[microbadger-image-size]: https://img.shields.io/microbadger/image-size/jestefane/php-dev/7.2-cli-1.1.0 "MicroBadger Size"
+[docker-builds]: https://hub.docker.com/r/jestefane/php-dev/builds "Docker Builds"
+[docker-overview]: https://hub.docker.com/r/jestefane/php-dev "Docker Overview"
+[microbadger-layers]: https://img.shields.io/microbadger/layers/jestefane/php-dev/7.2-cli-1.1.1 "MicroBadger Layers"
+[microbadger-image-size]: https://img.shields.io/microbadger/image-size/jestefane/php-dev/7.2-cli-1.1.1 "MicroBadger Size"
 [shortcuts]: #shortcuts "Shortcuts"
 [install-the-shortcuts]: #install-the-shortcuts "Install the Shortcuts"
 [docker-php]: https://hub.docker.com/_/php "Official Docker PHP Images"
 [images]: #images "PHP Images"
 [cli]: #cli "PHP CLI Image"
 [php-cli-ref]: #php-cli "PHP CLI Scripts"
-[php-cli-template]: template/php-cli.template "PHP CLI Template"
+[php-template]: template/php.template "PHP Template"
+[fpm]: #fpm "PHP FPM Image"
+[php-fpm-ref]: #php-fpm "PHP FPM Scripts"
 [composer]: https://getcomposer.org/ "Composer"
 [composer-template]: template/composer.template "Composer Template"
 [composer-ref]: #composer "PHP Composer Scripts"
 [templates]: #script-templates "Script Templates"
 [shortcuts-make]: #create-the-shortcuts	"Create the Shortcuts"
 [scripts-make]: #generate-the-scripts "Generate the Scripts"
-[license]: ./LICENSE "MIT License"
+[license]: ./LICENSE "MIT License File"

build/hooks/build

@@ -12,7 +12,7 @@ for php_version in $PHP_VERSIONS; do
     xdebug_version=-2.5.5
   fi;
   for php_variant in $PHP_VARIANTS; do
-    image_name="jestefane/php-dev:$php_version-$php_variant-$SOURCE_BRANCH"
+    image_name="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
     echo "Building image: $image_name"
     docker build \
       -t "$image_name" \

build/hooks/post_push

@@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 for php_version in $PHP_VERSIONS; do
   for php_variant in $PHP_VARIANTS; do
-    image_name="jestefane/php-dev:$php_version-$php_variant-$SOURCE_BRANCH"
+    image_name="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
     echo Pushing tag: "$image_name"
     docker push "$image_name"
   done