Merge branch 'release/v0.1.2'

* release/v0.1.2:
  Version bump to v0.1.2
  Fix PHP Composer installer

Author: rtucek

CHANGELOG.md

@@ -1,3 +1,7 @@
+## TAG v0.1.2 (2016-19-12)
+
+- Fix PHP composer installer.
+
 ## TAG v0.1.1 (2016-18-12)
 
 - Update Nginx to v1.11.7.

Dockerfile

@@ -192,7 +192,7 @@ RUN \
 
     # Install PHP composer
     php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
-    php -r "if (hash_file('SHA384', 'composer-setup.php') === 'aa96f26c2b67226a324c27919f1eb05f21c248b987e6195cad9690d5c1ff713d53020a02ac8c217dbf90a7eacc9d141d') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
+    php -r "if (hash_file('SHA384', 'composer-setup.php') === trim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
     php -r "unlink('composer-setup.php');" && \
 

Makefile

@@ -1,6 +1,6 @@
 REPO = janus1990
 IMAGE = docker-nginx-php
-VERSION = 0.1.1
+VERSION = 0.1.2
 EXTRAVERSION =
 
 IMAGE_FQN = $(REPO)/$(IMAGE):v$(VERSION)$(EXTRAVERSION)