Merge pull request #47 from docksal/develop

Release 2.2.0

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 \

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'

5.6/php-modules.txt

@@ -27,6 +27,7 @@ libxml
 mbstring
 mcrypt
 memcache
+mhash
 mssql
 mysqli
 mysqlnd

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 ()
@@ -46,12 +46,13 @@ 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 2>&1
 }
 
 # 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"
 
@@ -65,11 +66,11 @@ 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).
-# 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

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 \

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'

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 ()
@@ -46,12 +46,13 @@ 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 2>&1
 }
 
 # 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"
 
@@ -65,11 +66,11 @@ 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).
-# 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

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 \

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'

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 ()
@@ -46,12 +46,13 @@ 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 2>&1
 }
 
 # 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"
 
@@ -65,11 +66,11 @@ 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).
-# 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

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'

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 ()
@@ -46,12 +46,13 @@ 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 2>&1
 }
 
 # 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"
 
@@ -65,11 +66,11 @@ 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).
-# 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