Merge pull request #77 from docksal/develop

Release 2.4.0
docksal · Jul 31, 2018 · 3e9dffd · 3e9dffd
2 parents f694b44 + 04170af
commit 3e9dffd
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 95 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,12 @@ env:
     - VERSION=7.1
     - VERSION=7.2
 
+# Skip building master.
+# Stable image tags are pushed during release tag builds so that stable and release tags match on Docker Hub.
+branches:
+  except:
+  - master
+
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install libfcgi0ldbl  # cgi-fcgi binary used in tests

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -22,8 +22,9 @@ RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		apt-transport-https \
-		ca-certificates \
-		curl \
+		# ca-certificates and curl come from upstream
+		#ca-certificates \
+		#curl \
 		gnupg \
 		locales \
 		wget \
@@ -41,15 +42,13 @@ ENV LC_ALL C.UTF-8
 # Enable additional repos
 RUN set -xe; \
 	sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
-	# backports repo
-	echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
 	# blackfire.io repo
 	curl -fsSL https://packagecloud.io/gpg.key | apt-key add -; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
-	echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list;
+	echo 'deb https://packagecloud.io/github/git-lfs/debian stretch main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb-src https://packagecloud.io/github/git-lfs/debian stretch main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list;
 
 # Additional packages
 RUN set -xe; \
@@ -60,11 +59,13 @@ RUN set -xe; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
+		git \
 		git-lfs \
 		ghostscript \
 		# html2text binary - used for self-testing (php-fpm)
 		html2text \
 		imagemagick \
+		iputils-ping \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
@@ -81,10 +82,7 @@ RUN set -xe; \
 		supervisor \
 		unzip \
 		zip \
-		zsh \
 	;\
-	# More recent version of git to get composer's git cache.
-	apt-get -y --no-install-recommends -t jessie-backports install git >/dev/null ;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
 
@@ -120,9 +118,10 @@ ENV NOTVISIBLE "in users profile"
 
 # PHP
 RUN set -xe; \
+	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
+	# See https://github.com/docker-library/php/blob/4af0a8734a48ab84ee96de513aabc45418b63dc5/7.2/stretch/fpm/Dockerfile#L18-L37
 	buildDeps=" \
 		freetds-dev \
-		g++ \
 		libc-client2007e-dev \
 		libfreetype6-dev \
 		libgpgme11-dev \

diff --git a/5.6/startup.sh b/5.6/startup.sh
@@ -98,10 +98,10 @@ convert_secrets
 # 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 at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
 # We apply a fix/workaround for this at startup (non-recursive).
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" /var/www
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" /var/www
 
 # Automatically authenticate with Pantheon in Terminus token is present
 # Note: this has to happen after th home directory permissions are reset,

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -22,8 +22,9 @@ RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		apt-transport-https \
-		ca-certificates \
-		curl \
+		# ca-certificates and curl come from upstream
+		#ca-certificates \
+		#curl \
 		gnupg \
 		locales \
 		wget \
@@ -41,18 +42,16 @@ ENV LC_ALL C.UTF-8
 # Enable additional repos
 RUN set -xe; \
 	sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
-	# backports repo
-	echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
 	# blackfire.io repo
 	curl -fsSL https://packagecloud.io/gpg.key | apt-key add -; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
-	echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb https://packagecloud.io/github/git-lfs/debian stretch main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb-src https://packagecloud.io/github/git-lfs/debian stretch main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
 	# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 	curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-	echo 'deb https://packages.microsoft.com/debian/8/prod jessie main' | tee /etc/apt/sources.list.d/mssql.list;
+	echo 'deb https://packages.microsoft.com/debian/9/prod stretch main' | tee /etc/apt/sources.list.d/mssql.list;
 
 # Additional packages
 RUN set -xe; \
@@ -63,11 +62,13 @@ RUN set -xe; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
+		git \
 		git-lfs \
 		ghostscript \
 		# html2text binary - used for self-testing (php-fpm)
 		html2text \
 		imagemagick \
+		iputils-ping \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
@@ -84,10 +85,7 @@ RUN set -xe; \
 		supervisor \
 		unzip \
 		zip \
-		zsh \
 	;\
-	# More recent version of git to get composer's git cache.
-	apt-get -y --no-install-recommends -t jessie-backports install git >/dev/null ;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
 
@@ -123,8 +121,9 @@ ENV NOTVISIBLE "in users profile"
 
 # PHP
 RUN set -xe; \
+	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
+	# See https://github.com/docker-library/php/blob/4af0a8734a48ab84ee96de513aabc45418b63dc5/7.2/stretch/fpm/Dockerfile#L18-L37
 	buildDeps=" \
-		g++ \
 		libc-client2007e-dev \
 		libfreetype6-dev \
 		libgpgme11-dev \

diff --git a/7.0/startup.sh b/7.0/startup.sh
@@ -98,10 +98,10 @@ convert_secrets
 # 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 at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
 # We apply a fix/workaround for this at startup (non-recursive).
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" /var/www
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" /var/www
 
 # Automatically authenticate with Pantheon in Terminus token is present
 # Note: this has to happen after th home directory permissions are reset,

diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -22,8 +22,9 @@ RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		apt-transport-https \
-		ca-certificates \
-		curl \
+		# ca-certificates and curl come from upstream
+		#ca-certificates \
+		#curl \
 		gnupg \
 		locales \
 		wget \
@@ -41,18 +42,16 @@ ENV LC_ALL C.UTF-8
 # Enable additional repos
 RUN set -xe; \
 	sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
-	# backports repo
-	echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
 	# blackfire.io repo
 	curl -fsSL https://packagecloud.io/gpg.key | apt-key add -; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
-	echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb https://packagecloud.io/github/git-lfs/debian stretch main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb-src https://packagecloud.io/github/git-lfs/debian stretch main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
 	# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 	curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-	echo 'deb https://packages.microsoft.com/debian/8/prod jessie main' | tee /etc/apt/sources.list.d/mssql.list;
+	echo 'deb https://packages.microsoft.com/debian/9/prod stretch main' | tee /etc/apt/sources.list.d/mssql.list;
 
 # Additional packages
 RUN set -xe; \
@@ -63,11 +62,13 @@ RUN set -xe; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
+		git \
 		git-lfs \
 		ghostscript \
 		# html2text binary - used for self-testing (php-fpm)
 		html2text \
 		imagemagick \
+		iputils-ping \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
@@ -84,10 +85,7 @@ RUN set -xe; \
 		supervisor \
 		unzip \
 		zip \
-		zsh \
 	;\
-	# More recent version of git to get composer's git cache.
-	apt-get -y --no-install-recommends -t jessie-backports install git >/dev/null ;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
 
@@ -123,8 +121,9 @@ ENV NOTVISIBLE "in users profile"
 
 # PHP
 RUN set -xe; \
+	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
+	# See https://github.com/docker-library/php/blob/4af0a8734a48ab84ee96de513aabc45418b63dc5/7.2/stretch/fpm/Dockerfile#L18-L37
 	buildDeps=" \
-		g++ \
 		libc-client2007e-dev \
 		libfreetype6-dev \
 		libgpgme11-dev \

diff --git a/7.1/startup.sh b/7.1/startup.sh
@@ -98,10 +98,10 @@ convert_secrets
 # 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 at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
 # We apply a fix/workaround for this at startup (non-recursive).
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" /var/www
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" /var/www
 
 # Automatically authenticate with Pantheon in Terminus token is present
 # Note: this has to happen after th home directory permissions are reset,

diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -22,8 +22,9 @@ RUN set -xe; \
 	apt-get update >/dev/null; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		apt-transport-https \
-		ca-certificates \
-		curl \
+		# ca-certificates and curl come from upstream
+		#ca-certificates \
+		#curl \
 		gnupg \
 		locales \
 		wget \
@@ -41,18 +42,16 @@ ENV LC_ALL C.UTF-8
 # Enable additional repos
 RUN set -xe; \
 	sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
-	# backports repo
-	echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
 	# blackfire.io repo
 	curl -fsSL https://packagecloud.io/gpg.key | apt-key add -; \
 	echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
 	# git-lfs repo
 	curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
-	echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
-	echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb https://packagecloud.io/github/git-lfs/debian stretch main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
+	echo 'deb-src https://packagecloud.io/github/git-lfs/debian stretch main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
 	# MSQSQL repo - msodbcsql17, pecl/sqlsrv and pecl/pdo_sqlsrv (PHP 7.0+ only)
 	curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
-	echo 'deb https://packages.microsoft.com/debian/8/prod jessie main' | tee /etc/apt/sources.list.d/mssql.list;
+	echo 'deb https://packages.microsoft.com/debian/9/prod stretch main' | tee /etc/apt/sources.list.d/mssql.list;
 
 # Additional packages
 RUN set -xe; \
@@ -63,11 +62,13 @@ RUN set -xe; \
 	apt-get -y --no-install-recommends install >/dev/null \
 		cron \
 		dnsutils \
+		git \
 		git-lfs \
 		ghostscript \
 		# html2text binary - used for self-testing (php-fpm)
 		html2text \
 		imagemagick \
+		iputils-ping \
 		less \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
@@ -84,10 +85,7 @@ RUN set -xe; \
 		supervisor \
 		unzip \
 		zip \
-		zsh \
 	;\
-	# More recent version of git to get composer's git cache.
-	apt-get -y --no-install-recommends -t jessie-backports install git >/dev/null ;\
 	# Cleanup
 	apt-get clean; rm -rf /var/lib/apt/lists/*
 
@@ -123,8 +121,9 @@ ENV NOTVISIBLE "in users profile"
 
 # PHP
 RUN set -xe; \
+	# Note: essential build tools (g++, gcc, make, etc) are included upstream as persistent packages.
+	# See https://github.com/docker-library/php/blob/4af0a8734a48ab84ee96de513aabc45418b63dc5/7.2/stretch/fpm/Dockerfile#L18-L37
 	buildDeps=" \
-		g++ \
 		libc-client2007e-dev \
 		libfreetype6-dev \
 		libgpgme11-dev \

diff --git a/7.2/startup.sh b/7.2/startup.sh
@@ -98,10 +98,10 @@ convert_secrets
 # 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 at runtime.
 echo-debug "Resetting permissions on $HOME_DIR and /var/www..."
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" -R "$HOME_DIR"
 # Docker resets the project root folder permissions to 0:0 when cli is recreated (e.g. an env variable updated).
 # We apply a fix/workaround for this at startup (non-recursive).
-chown "${HOST_UID-:1000}:${HOST_GID:-1000}" /var/www
+chown "${HOST_UID:-1000}:${HOST_GID:-1000}" /var/www
 
 # Automatically authenticate with Pantheon in Terminus token is present
 # Note: this has to happen after th home directory permissions are reset,