From 7f19acd5b1508c62a944b0a5d11005c4254d8856 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 12:20:43 -0700
Subject: [PATCH 1/9] Silence terminus auth:login

---
 5.6/startup.sh | 2 +-
 7.0/startup.sh | 2 +-
 7.1/startup.sh | 2 +-
 7.2/startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index 470679d4..3bdd4986 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN"
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
 }
 
 # Process templates
diff --git a/7.0/startup.sh b/7.0/startup.sh
index 470679d4..3bdd4986 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN"
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
 }
 
 # Process templates
diff --git a/7.1/startup.sh b/7.1/startup.sh
index 470679d4..3bdd4986 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN"
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
 }
 
 # Process templates
diff --git a/7.2/startup.sh b/7.2/startup.sh
index 470679d4..3bdd4986 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN"
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
 }
 
 # Process templates

From 2c6b2f3124dc4c8ffffc347db6073c7e72de861c Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 12:20:54 -0700
Subject: [PATCH 2/9] Minor comment update

---
 5.6/startup.sh | 2 +-
 7.0/startup.sh | 2 +-
 7.1/startup.sh | 2 +-
 7.2/startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index 3bdd4986..916a0793 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -65,7 +65,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 [[ "$XDEBUG_ENABLED" != "" ]] && [[ "$XDEBUG_ENABLED" != "0" ]] && xdebug_enable
 
 # Make sure permissions are correct (after uid/gid change and COPY operations in Dockerfile)
-# To not bloat the image size permissions on the home folder are reset during image startup (in startup.sh)
+# To not bloat the image size, permissions on the home folder are reset at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
diff --git a/7.0/startup.sh b/7.0/startup.sh
index 3bdd4986..916a0793 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -65,7 +65,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 [[ "$XDEBUG_ENABLED" != "" ]] && [[ "$XDEBUG_ENABLED" != "0" ]] && xdebug_enable
 
 # Make sure permissions are correct (after uid/gid change and COPY operations in Dockerfile)
-# To not bloat the image size permissions on the home folder are reset during image startup (in startup.sh)
+# To not bloat the image size, permissions on the home folder are reset at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
diff --git a/7.1/startup.sh b/7.1/startup.sh
index 3bdd4986..916a0793 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -65,7 +65,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 [[ "$XDEBUG_ENABLED" != "" ]] && [[ "$XDEBUG_ENABLED" != "0" ]] && xdebug_enable
 
 # Make sure permissions are correct (after uid/gid change and COPY operations in Dockerfile)
-# To not bloat the image size permissions on the home folder are reset during image startup (in startup.sh)
+# To not bloat the image size, permissions on the home folder are reset at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
diff --git a/7.2/startup.sh b/7.2/startup.sh
index 3bdd4986..916a0793 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -65,7 +65,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 [[ "$XDEBUG_ENABLED" != "" ]] && [[ "$XDEBUG_ENABLED" != "0" ]] && xdebug_enable
 
 # Make sure permissions are correct (after uid/gid change and COPY operations in Dockerfile)
-# To not bloat the image size permissions on the home folder are reset during image startup (in startup.sh)
+# To not bloat the image size, permissions on the home folder are reset at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).

From 54085e936e71e4156f30bdadf375280dfdaa3da9 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 13:50:46 -0700
Subject: [PATCH 3/9] Fixing tests

mhash was added upstream in php:5.6-fpm
---
 5.6/php-modules.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/5.6/php-modules.txt b/5.6/php-modules.txt
index 4f01f5a1..440b917a 100644
--- a/5.6/php-modules.txt
+++ b/5.6/php-modules.txt
@@ -27,6 +27,7 @@ libxml
 mbstring
 mcrypt
 memcache
+mhash
 mssql
 mysqli
 mysqlnd

From f806ce8f9309c435c345231f2c35d40109125a10 Mon Sep 17 00:00:00 2001
From: Oleksii Chekulaiev <achekulaev@gmail.com>
Date: Mon, 14 May 2018 15:12:10 -0400
Subject: [PATCH 4/9] Fix id_rsa key file permissions to avoid ssh warning
 (Fixes #44)

---
 5.6/startup.sh | 1 +
 7.0/startup.sh | 1 +
 7.1/startup.sh | 1 +
 7.2/startup.sh | 1 +
 4 files changed, 4 insertions(+)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index 916a0793..0a743906 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -52,6 +52,7 @@ terminus_login ()
 # Process templates
 # Private SSH key
 render_tmpl "$HOME_DIR/.ssh/id_rsa"
+chmod 0600 "$HOME_DIR/.ssh/id_rsa"
 # Acquia Cloud API config
 render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 
diff --git a/7.0/startup.sh b/7.0/startup.sh
index 916a0793..0a743906 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -52,6 +52,7 @@ terminus_login ()
 # Process templates
 # Private SSH key
 render_tmpl "$HOME_DIR/.ssh/id_rsa"
+chmod 0600 "$HOME_DIR/.ssh/id_rsa"
 # Acquia Cloud API config
 render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 
diff --git a/7.1/startup.sh b/7.1/startup.sh
index 916a0793..0a743906 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -52,6 +52,7 @@ terminus_login ()
 # Process templates
 # Private SSH key
 render_tmpl "$HOME_DIR/.ssh/id_rsa"
+chmod 0600 "$HOME_DIR/.ssh/id_rsa"
 # Acquia Cloud API config
 render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 
diff --git a/7.2/startup.sh b/7.2/startup.sh
index 916a0793..0a743906 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -52,6 +52,7 @@ terminus_login ()
 # Process templates
 # Private SSH key
 render_tmpl "$HOME_DIR/.ssh/id_rsa"
+chmod 0600 "$HOME_DIR/.ssh/id_rsa"
 # Acquia Cloud API config
 render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 

From 650855159696c7dd356388ace4892c76bde200a2 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 18:34:50 -0700
Subject: [PATCH 5/9] Silence terminus auth:login (stderr)

Since terminus writes notices (e.g. "[notice] Logging in via machine token.") to stderr output, we silence it entirely.
---
 5.6/startup.sh | 2 +-
 7.0/startup.sh | 2 +-
 7.1/startup.sh | 2 +-
 7.2/startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index 0a743906..72d96d61 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" >/dev/null 2>&1
 }
 
 # Process templates
diff --git a/7.0/startup.sh b/7.0/startup.sh
index 0a743906..72d96d61 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" >/dev/null 2>&1
 }
 
 # Process templates
diff --git a/7.1/startup.sh b/7.1/startup.sh
index 0a743906..72d96d61 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" >/dev/null 2>&1
 }
 
 # Process templates
diff --git a/7.2/startup.sh b/7.2/startup.sh
index 0a743906..72d96d61 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -46,7 +46,7 @@ render_tmpl ()
 terminus_login ()
 {
 	echo-debug "Authenticating with Pantheon..."
-	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" > /dev/null
+	terminus auth:login --machine-token="$SECRET_TERMINUS_TOKEN" >/dev/null 2>&1
 }
 
 # Process templates

From 9b7ba6be349a93ee2f16dba56244c1af89fd7d24 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 18:35:25 -0700
Subject: [PATCH 6/9] Added a timestamp in echo-debug in startup.sh

---
 5.6/startup.sh | 2 +-
 7.0/startup.sh | 2 +-
 7.1/startup.sh | 2 +-
 7.2/startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index 72d96d61..b14cacd8 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -10,7 +10,7 @@ DEBUG=${DEBUG:-0}
 [[ "$1" == "supervisord" ]] && DEBUG=1
 echo-debug ()
 {
-	[[ "$DEBUG" != 0 ]] && echo "$@"
+	[[ "$DEBUG" != 0 ]] && echo "$(date +"%F %H:%M:%S") | $@"
 }
 
 uid_gid_reset ()
diff --git a/7.0/startup.sh b/7.0/startup.sh
index 72d96d61..b14cacd8 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -10,7 +10,7 @@ DEBUG=${DEBUG:-0}
 [[ "$1" == "supervisord" ]] && DEBUG=1
 echo-debug ()
 {
-	[[ "$DEBUG" != 0 ]] && echo "$@"
+	[[ "$DEBUG" != 0 ]] && echo "$(date +"%F %H:%M:%S") | $@"
 }
 
 uid_gid_reset ()
diff --git a/7.1/startup.sh b/7.1/startup.sh
index 72d96d61..b14cacd8 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -10,7 +10,7 @@ DEBUG=${DEBUG:-0}
 [[ "$1" == "supervisord" ]] && DEBUG=1
 echo-debug ()
 {
-	[[ "$DEBUG" != 0 ]] && echo "$@"
+	[[ "$DEBUG" != 0 ]] && echo "$(date +"%F %H:%M:%S") | $@"
 }
 
 uid_gid_reset ()
diff --git a/7.2/startup.sh b/7.2/startup.sh
index 72d96d61..b14cacd8 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -10,7 +10,7 @@ DEBUG=${DEBUG:-0}
 [[ "$1" == "supervisord" ]] && DEBUG=1
 echo-debug ()
 {
-	[[ "$DEBUG" != 0 ]] && echo "$@"
+	[[ "$DEBUG" != 0 ]] && echo "$(date +"%F %H:%M:%S") | $@"
 }
 
 uid_gid_reset ()

From 7ed6326fc3d9de8e0006680eaf52af84d0de8caf Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 14 May 2018 18:35:34 -0700
Subject: [PATCH 7/9] Minor comment update

---
 5.6/startup.sh | 2 +-
 7.0/startup.sh | 2 +-
 7.1/startup.sh | 2 +-
 7.2/startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/5.6/startup.sh b/5.6/startup.sh
index b14cacd8..9a577e6b 100755
--- a/5.6/startup.sh
+++ b/5.6/startup.sh
@@ -70,7 +70,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
-# Why apply a fix/woraround for this at startup.
+# We apply a fix/workaround for this at startup.
 chown "$HOST_UID:$HOST_GID" /var/www
 
 # Initialization steps completed. Create a pid file to mark the container as healthy
diff --git a/7.0/startup.sh b/7.0/startup.sh
index b14cacd8..9a577e6b 100755
--- a/7.0/startup.sh
+++ b/7.0/startup.sh
@@ -70,7 +70,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
-# Why apply a fix/woraround for this at startup.
+# We apply a fix/workaround for this at startup.
 chown "$HOST_UID:$HOST_GID" /var/www
 
 # Initialization steps completed. Create a pid file to mark the container as healthy
diff --git a/7.1/startup.sh b/7.1/startup.sh
index b14cacd8..9a577e6b 100755
--- a/7.1/startup.sh
+++ b/7.1/startup.sh
@@ -70,7 +70,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
-# Why apply a fix/woraround for this at startup.
+# We apply a fix/workaround for this at startup.
 chown "$HOST_UID:$HOST_GID" /var/www
 
 # Initialization steps completed. Create a pid file to mark the container as healthy
diff --git a/7.2/startup.sh b/7.2/startup.sh
index b14cacd8..9a577e6b 100755
--- a/7.2/startup.sh
+++ b/7.2/startup.sh
@@ -70,7 +70,7 @@ render_tmpl "$HOME_DIR/.acquia/cloudapi.conf"
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
 chown "$HOST_UID:$HOST_GID" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
-# Why apply a fix/woraround for this at startup.
+# We apply a fix/workaround for this at startup.
 chown "$HOST_UID:$HOST_GID" /var/www
 
 # Initialization steps completed. Create a pid file to mark the container as healthy

From 4acc7418201cd1bac96972a48791bb722b1fcc02 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Tue, 29 May 2018 14:48:18 -0700
Subject: [PATCH 8/9] Blackfire PHP settings

These got accidentally dropped during the 2.0 cli image upgrade. Resolves docksal/docksal#561
---
 5.6/config/php/zz-php.ini | 2 ++
 7.0/config/php/zz-php.ini | 2 ++
 7.1/config/php/zz-php.ini | 2 ++
 7.2/config/php/zz-php.ini | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/5.6/config/php/zz-php.ini b/5.6/config/php/zz-php.ini
index 0ffa2847..d521ad93 100644
--- a/5.6/config/php/zz-php.ini
+++ b/5.6/config/php/zz-php.ini
@@ -14,3 +14,5 @@ sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
 ; Extention settings
 [opcache]
 opcache.memory_consumption = 128
+[blackfire]
+blackfire.agent_socket = 'tcp://blackfire:8707'
diff --git a/7.0/config/php/zz-php.ini b/7.0/config/php/zz-php.ini
index 1d775cd0..2da599b5 100644
--- a/7.0/config/php/zz-php.ini
+++ b/7.0/config/php/zz-php.ini
@@ -13,3 +13,5 @@ sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
 ; Extention settings
 [opcache]
 opcache.memory_consumption = 128
+[blackfire]
+blackfire.agent_socket = 'tcp://blackfire:8707'
diff --git a/7.1/config/php/zz-php.ini b/7.1/config/php/zz-php.ini
index 1d775cd0..2da599b5 100644
--- a/7.1/config/php/zz-php.ini
+++ b/7.1/config/php/zz-php.ini
@@ -13,3 +13,5 @@ sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
 ; Extention settings
 [opcache]
 opcache.memory_consumption = 128
+[blackfire]
+blackfire.agent_socket = 'tcp://blackfire:8707'
diff --git a/7.2/config/php/zz-php.ini b/7.2/config/php/zz-php.ini
index 1d775cd0..2da599b5 100644
--- a/7.2/config/php/zz-php.ini
+++ b/7.2/config/php/zz-php.ini
@@ -13,3 +13,5 @@ sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
 ; Extention settings
 [opcache]
 opcache.memory_consumption = 128
+[blackfire]
+blackfire.agent_socket = 'tcp://blackfire:8707'

From d07854ead9d7da38d846dad652500b41488e80d2 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Wed, 30 May 2018 11:23:36 -0700
Subject: [PATCH 9/9] Debian Stretch compatibility fix for 5.6, 7.0 and 7.1

Upstream php:x.y-fpm images switched to Debian Stretch. 7.2 was already on Stretch.
---
 5.6/Dockerfile | 16 ++++++++++------
 7.0/Dockerfile | 16 ++++++++++------
 7.1/Dockerfile | 16 ++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 52554d3d..2a6d61d7 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -22,6 +22,7 @@ RUN set -xe; \
 		apt-transport-https \
 		ca-certificates \
 		curl \
+		gnupg \
 		locales \
 		wget \
 	;\
@@ -53,6 +54,9 @@ RUN set -xe; \
 
 # Additional packages
 RUN set -xe; \
+	# Create man direcotries, otherwise some packages may not install (e.g. postgresql-client)
+	# This should be a temporary workaround until fixed upstream: https://github.com/debuerreotype/debuerreotype/issues/10
+	mkdir -p /usr/share/man/man1 /usr/share/man/man7; \
 	apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
@@ -63,7 +67,7 @@ RUN set -xe; \
 		imagemagick \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
-		libfcgi0ldbl \
+		libfcgi-bin \
 		mc \
 		mysql-client \
 		nano \
@@ -127,7 +131,7 @@ RUN set -xe; \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libmhash-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 		libssh2-1-dev \
 		libxslt1-dev \
@@ -139,14 +143,14 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu52 \
+		libicu57 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
-		libmagickcore-6.q16-2 \
-		libmagickwand-6.q16-2 \
+		libmagickcore-6.q16-3 \
+		libmagickwand-6.q16-3 \
 		libmcrypt4 \
 		libmhash2 \
-		libpng12-0 \
+		libpng16-16 \
 		libpq5 \
 		libssh2-1 \
 		libsybdb5 \
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index 4ec97bf8..ae314a24 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -22,6 +22,7 @@ RUN set -xe; \
 		apt-transport-https \
 		ca-certificates \
 		curl \
+		gnupg \
 		locales \
 		wget \
 	;\
@@ -56,6 +57,9 @@ RUN set -xe; \
 
 # Additional packages
 RUN set -xe; \
+	# Create man direcotries, otherwise some packages may not install (e.g. postgresql-client)
+	# This should be a temporary workaround until fixed upstream: https://github.com/debuerreotype/debuerreotype/issues/10
+	mkdir -p /usr/share/man/man1 /usr/share/man/man7; \
 	apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
@@ -66,7 +70,7 @@ RUN set -xe; \
 		imagemagick \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
-		libfcgi0ldbl \
+		libfcgi-bin \
 		mc \
 		mysql-client \
 		nano \
@@ -129,7 +133,7 @@ RUN set -xe; \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libmhash-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 		libssh2-1-dev \
 		libxslt1-dev \
@@ -145,16 +149,16 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu52 \
+		libicu57 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
-		libmagickcore-6.q16-2 \
-		libmagickwand-6.q16-2 \
+		libmagickcore-6.q16-3 \
+		libmagickwand-6.q16-3 \
 		libmcrypt4 \
 		libmemcached11 \
 		libmemcachedutil2 \
 		libmhash2 \
-		libpng12-0 \
+		libpng16-16 \
 		libpq5 \
 		libssh2-1 \
 		libxslt1.1 \
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
index 53b1d3ce..e1d3dbcb 100644
--- a/7.1/Dockerfile
+++ b/7.1/Dockerfile
@@ -22,6 +22,7 @@ RUN set -xe; \
 		apt-transport-https \
 		ca-certificates \
 		curl \
+		gnupg \
 		locales \
 		wget \
 	;\
@@ -56,6 +57,9 @@ RUN set -xe; \
 
 # Additional packages
 RUN set -xe; \
+	# Create man direcotries, otherwise some packages may not install (e.g. postgresql-client)
+	# This should be a temporary workaround until fixed upstream: https://github.com/debuerreotype/debuerreotype/issues/10
+	mkdir -p /usr/share/man/man1 /usr/share/man/man7; \
 	apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
@@ -66,7 +70,7 @@ RUN set -xe; \
 		imagemagick \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
-		libfcgi0ldbl \
+		libfcgi-bin \
 		mc \
 		mysql-client \
 		nano \
@@ -129,7 +133,7 @@ RUN set -xe; \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libmhash-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 		libssh2-1-dev \
 		libxslt1-dev \
@@ -145,16 +149,16 @@ RUN set -xe; \
 		libc-client2007e \
 		libfreetype6 \
 		libgpgme11 \
-		libicu52 \
+		libicu57 \
 		libjpeg62-turbo \
 		libldap-2.4-2 \
-		libmagickcore-6.q16-2 \
-		libmagickwand-6.q16-2 \
+		libmagickcore-6.q16-3 \
+		libmagickwand-6.q16-3 \
 		libmcrypt4 \
 		libmemcached11 \
 		libmemcachedutil2 \
 		libmhash2 \
-		libpng12-0 \
+		libpng16-16 \
 		libpq5 \
 		libssh2-1 \
 		libxslt1.1 \