Merge pull request #107 from docksal/feature/php-ext-updates

PHP extension updates
docksal · Jan 17, 2019 · 5509745 · 5509745
2 parents 4640dae + d1fe14c
commit 5509745
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 69 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -213,8 +213,6 @@ RUN set -xe; \
 		redis \
 		ssh2 \
 	;\
-	# Disable xdebug by default
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
 	# Cleanup
 	docker-php-source delete; \
 	rm -rf /tmp/pear ~/.pearrc; \

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -163,7 +163,7 @@ RUN set -xe; \
 		libzip4 \
 		msodbcsql17 \
 	;\
-	# SSH2 must be installed from source
+	# SSH2 must be installed from source for PHP 7.x
 	git clone https://github.com/php/pecl-networking-ssh2.git /usr/src/php/ext/ssh2 && rm -rf /usr/src/php/ext/ssh2/.git; \
 	\
 	docker-php-ext-configure >/dev/null gd \
@@ -221,8 +221,6 @@ RUN set -xe; \
 		redis \
 		sqlsrv \
 	;\
-	# Disable xdebug by default
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
 	# Cleanup
 	docker-php-source delete; \
 	rm -rf /tmp/pear ~/.pearrc; \

diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -163,7 +163,7 @@ RUN set -xe; \
 		libzip4 \
 		msodbcsql17 \
 	;\
-	# SSH2 must be installed from source
+	# SSH2 must be installed from source for PHP 7.x
 	git clone https://github.com/php/pecl-networking-ssh2.git /usr/src/php/ext/ssh2 && rm -rf /usr/src/php/ext/ssh2/.git; \
 	\
 	docker-php-ext-configure >/dev/null gd \
@@ -187,6 +187,7 @@ RUN set -xe; \
 		imap \
 		intl \
 		ldap \
+		# mcrypt is deprecated in 7.1 and removed in 7.2. See Deprecated features.
 		mcrypt \
 		mysqli \
 		opcache \
@@ -221,8 +222,6 @@ RUN set -xe; \
 		redis \
 		sqlsrv \
 	;\
-	# Disable xdebug by default
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
 	# Cleanup
 	docker-php-source delete; \
 	rm -rf /tmp/pear ~/.pearrc; \

diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -125,7 +125,6 @@ RUN set -xe; \
 		libldap2-dev \
 		libmagickcore-dev \
 		libmagickwand-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libmhash-dev \
 		libpng-dev \
@@ -151,7 +150,6 @@ RUN set -xe; \
 		libldap-2.4-2 \
 		libmagickcore-6.q16-3 \
 		libmagickwand-6.q16-3 \
-		libmcrypt4 \
 		libmemcached11 \
 		libmemcachedutil2 \
 		libmhash2 \
@@ -163,10 +161,8 @@ RUN set -xe; \
 		libzip4 \
 		msodbcsql17 \
 	;\
-	# SSH2 must be installed from source
+	# SSH2 must be installed from source for PHP 7.x
 	git clone https://github.com/php/pecl-networking-ssh2.git /usr/src/php/ext/ssh2 && rm -rf /usr/src/php/ext/ssh2/.git; \
-	# XDEBUG must be installed from source
-	git clone https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug && rm -rf /usr/src/php/ext/xdebug/.git; \
 	\
 	docker-php-ext-configure >/dev/null gd \
 		--with-freetype-dir=/usr/include/ \
@@ -189,7 +185,8 @@ RUN set -xe; \
 		imap \
 		intl \
 		ldap \
-		# mcrypt is removed from 7.2. See Deprecated features
+		# mcrypt is deprecated in 7.1 and removed in 7.2. See Deprecated features.
+		# mcrypt \
 		mysqli \
 		opcache \
 		pcntl \
@@ -199,7 +196,6 @@ RUN set -xe; \
 		soap \
 		sockets \
 		ssh2 \
-		xdebug \
 		xsl \
 		zip \
 	;\
@@ -213,6 +209,7 @@ RUN set -xe; \
 		pdo_sqlsrv \
 		redis \
 		sqlsrv \
+		xdebug \
 	;\
 	docker-php-ext-enable \
 		apcu \
@@ -223,8 +220,6 @@ RUN set -xe; \
 		redis \
 		sqlsrv \
 	;\
-	# Disable xdebug by default
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
 	# Cleanup
 	docker-php-source delete; \
 	rm -rf /tmp/pear ~/.pearrc; \

diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -125,7 +125,6 @@ RUN set -xe; \
 		libldap2-dev \
 		libmagickcore-dev \
 		libmagickwand-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libmhash-dev \
 		libpng-dev \
@@ -150,7 +149,6 @@ RUN set -xe; \
 		libldap-2.4-2 \
 		libmagickcore-6.q16-3 \
 		libmagickwand-6.q16-3 \
-		libmcrypt4 \
 		libmemcached11 \
 		libmemcachedutil2 \
 		libmhash2 \
@@ -162,10 +160,8 @@ RUN set -xe; \
 		libzip4 \
 		msodbcsql17 \
 	;\
-	# SSH2 must be installed from source
+	# SSH2 must be installed from source for PHP 7.x
 	git clone https://github.com/php/pecl-networking-ssh2.git /usr/src/php/ext/ssh2 && rm -rf /usr/src/php/ext/ssh2/.git; \
-	# XDEBUG must be installed from source
-	git clone https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug && rm -rf /usr/src/php/ext/xdebug/.git; \
 	\
 	docker-php-ext-configure >/dev/null gd \
 		--with-freetype-dir=/usr/include/ \
@@ -188,7 +184,8 @@ RUN set -xe; \
 		imap \
 		intl \
 		ldap \
-		# mcrypt is removed from 7.2. See Deprecated features
+		# mcrypt is deprecated in 7.1 and removed in 7.2. See Deprecated features.
+		# mcrypt \
 		mysqli \
 		opcache \
 		pcntl \
@@ -198,7 +195,6 @@ RUN set -xe; \
 		soap \
 		sockets \
 		ssh2 \
-		xdebug \
 		xsl \
 		zip \
 	;\
@@ -209,23 +205,21 @@ RUN set -xe; \
 		imagick \
 		# Use memcached (not memcache) for PHP 7.x
 		memcached \
-		# sqlsrv is currently not supported in PHP 7.3
-		#pdo_sqlsrv \
+		#pdo_sqlsrv - currently not supported in PHP 7.3
 		redis \
-		#sqlsrv \
+		#sqlsrv - currently not supported in PHP 7.3
+		# There is currently no stable pecl release of xdebug for PHP 7.3
+		xdebug-2.7.0beta1 \
 	;\
 	docker-php-ext-enable \
 		apcu \
 		gnupg \
 		imagick \
 		memcached \
-		# sqlsrv is currently not supported in PHP 7.3
-		#pdo_sqlsrv \
+		#pdo_sqlsrv - currently not supported in PHP 7.3
 		redis \
-		#sqlsrv \
+		#sqlsrv - currently not supported in PHP 7.3
 	;\
-	# Disable xdebug by default
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
 	# Cleanup
 	docker-php-source delete; \
 	rm -rf /tmp/pear ~/.pearrc; \

diff --git a/cloud9/tests/test.bats b/cloud9/tests/test.bats
@@ -65,7 +65,9 @@ _healthcheck_wait ()
 
 	### Setup ###
 	make start
-	_healthcheck_wait
+
+	run _healthcheck_wait
+	unset output
 	# This is a dirty hack to get tests to pass on Travis.
 	# TODO: This should be replaced with a proper Cloud9 healthcheck in Dockerfile
 	sleep 10

diff --git a/tests/.docksal/services/cli/crontab b/tests/.docksal/services/cli/crontab
@@ -1 +1 @@
-* * * * * echo "The current date is $(date)" >> /tmp/date.txt
+* * * * * echo "The current date is $(date)" > /tmp/date.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* * * * * echo "The current date is $(date)" >> /tmp/date.txt
		* * * * * echo "The current date is $(date)" > /tmp/date.txt