Merge pull request #171 from devilbox/release-0.111

Release v0.111

CHANGELOG.md

@@ -4,6 +4,25 @@
 ## Unreleased
 
 
+## Release 0.111
+
+#### Added
+- Added xdebug for PHP 8.0
+
+
+## Release 0.110
+
+#### Fixed
+- [169](https://github.com/devilbox/docker-php-fpm/issues/169) Fixes download for drupal console
+- Fixes laravel installer for PHP 7.2
+
+
+## Release 0.109
+
+#### Fixed
+- Fixed absolute paths in tests
+
+
 ## Release 0.108
 
 #### Added

Dockerfiles/mods/Dockerfile-8.0

@@ -413,6 +413,22 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: xdebug --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         GIT extension
+	&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
+	&& cd /tmp/xdebug \
+	# Default:      Install command
+	&& phpize \
+	&& ./configure  --enable-xdebug \
+	&& make -j$(getconf _NPROCESSORS_ONLN) \
+	&& make install \
+	# Enabling
+	&& docker-php-ext-enable xdebug \
+	&& true
+
+
 # -------------------- Installing PHP Extension: xsl --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -659,6 +675,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^tidy$' \
 	&& php -m | grep -oiE '^tokenizer$' \
 	&& php-fpm -m | grep -oiE '^tokenizer$' \
+	&& php -m | grep -oiE '^xdebug$' \
+	&& php-fpm -m | grep -oiE '^xdebug$' \
 	&& php -m | grep -oiE '^xml$' \
 	&& php-fpm -m | grep -oiE '^xml$' \
 	&& php -m | grep -oiE '^xmlreader$' \

Dockerfiles/work/Dockerfile-5.5

@@ -205,7 +205,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

Dockerfiles/work/Dockerfile-5.6

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

Dockerfiles/work/Dockerfile-7.0

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

Dockerfiles/work/Dockerfile-7.1

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

Dockerfiles/work/Dockerfile-7.2

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------
@@ -232,7 +233,7 @@ RUN set -eux \
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
-&& git checkout $(git describe --abbrev=0 --tags) \
+&& git checkout v4.0.0 \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \
 && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer install --no-interaction --no-progress --no-dev' \

Dockerfiles/work/Dockerfile-7.3

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

Dockerfiles/work/Dockerfile-7.4

@@ -219,7 +219,8 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
 # -------------------- gitflow --------------------

README.md

@@ -652,7 +652,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>8.0</th>
    <td id="80-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="80-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, intl, json, ldap, libxml, mbstring, memcached, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xml, xmlreader, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="80-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, intl, json, ldap, libxml, mbstring, memcached, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
  </tbody>
 </table>

build/ansible/group_vars/all/mods.yml

@@ -1023,7 +1023,7 @@ extensions_available:
       configure: --with-libxml-dir=/usr
       build_dep: [libxml2-dev]
   xdebug:
-    disabled: [8.0]
+    disabled: []
     5.2:
       type: pecl
       version: 2.2.7
@@ -1042,6 +1042,10 @@ extensions_available:
     7.0:
       type: pecl
       version: 2.9.0
+    8.0:
+      type: git
+      git_url: https://github.com/xdebug/xdebug
+      configure: --enable-xdebug
     all:
       type: pecl
   xml:

build/ansible/group_vars/all/work.yml

@@ -498,7 +498,8 @@ software_available:
     disabled: [5.2, 5.3, 5.4, 8.0] # TODO: re-enable for 8.0 (currently errors)
     check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]'
     all:
-      command: curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal
+      pre: DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')"
+      command: curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal
       post: chmod +x /usr/local/bin/drupal
   gitflow:
     check: git-flow version | grep -E '[0-9][.0-9]+'
@@ -546,6 +547,13 @@ software_available:
         && git checkout $(git tag | grep '^v2\.3\.' | sort -u | tail -1) \
       post:
         ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel
+    7.2:
+      pre: |
+        git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
+        && cd /usr/local/src/laravel-installer \
+        && git checkout v4.0.0 \
+      post:
+        ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel
     all:
       pre: |
         git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \

tests/mods/modules/imagick/imagick-pdf.php

@@ -20,9 +20,12 @@ if (version_compare($PHP_VERSION, '8.0.0', '>=')) {
         exit(0);
 }
 
+$dir = realpath(dirname(__FILE__));
+$file = $dir . DIRECTORY_SEPARATOR . 'dummy.pdf';
+
 $img = new Imagick();
 
-if ($img->readImage('dummy.pdf') !== True) {
+if ($img->readImage($file) !== True) {
 	echo 'FAIL: newImage()';
 	exit(1);
 }