Merge pull request #115 from devilbox/release-0.87

Fix scss_lint install

Dockerfiles/mods/Dockerfile-7.4

@@ -160,11 +160,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
 	\
-# ---- Installing PHP Extension: interbase ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \
-	&& (rm -rf /usr/local/lib/php/test/interbase || true) \
-	&& (rm -rf /usr/local/lib/php/doc/interbase || true) \
-	\
 # ---- Installing PHP Extension: intl ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
 	&& (rm -rf /usr/local/lib/php/test/intl || true) \
@@ -471,8 +466,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
-	&& php -m | grep -oiE '^interbase$' \
-	&& php-fpm -m | grep -oiE '^interbase$' \
 	&& php -m | grep -oiE '^intl$' \
 	&& php-fpm -m | grep -oiE '^intl$' \
 	&& php -m | grep -oiE '^json$' \

Dockerfiles/mods/Dockerfile-8.0

@@ -148,11 +148,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/gmp || true) \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
-# ---- Installing PHP Extension: interbase ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \
-	&& (rm -rf /usr/local/lib/php/test/interbase || true) \
-	&& (rm -rf /usr/local/lib/php/doc/interbase || true) \
-	\
 # ---- Installing PHP Extension: intl ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
 	&& (rm -rf /usr/local/lib/php/test/intl || true) \
@@ -368,6 +363,24 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/tidy || true) \
 	&& (rm -rf /usr/local/lib/php/doc/tidy || true) \
 	\
+# ---- Installing PHP Extension: uploadprogress ----
+	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
+	&& cd /tmp/uploadprogress \
+	&& true \
+# FIXME: This is a work-around to mitigate compile error with PHP 8.0
+&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
+&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
+&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
+&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
+&& phpize \
+&& ./configure --enable-uploadprogress \
+&& make \
+&& make install \
+ \
+	&& docker-php-ext-enable uploadprogress \
+	&& (rm -rf /usr/local/lib/php/test/uploadprogress || true) \
+	&& (rm -rf /usr/local/lib/php/doc/uploadprogress || true) \
+	\
 # ---- Installing PHP Extension: xmlrpc ----
 	&& /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
@@ -459,8 +472,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^hash$' \
 	&& php -m | grep -oiE '^iconv$' \
 	&& php-fpm -m | grep -oiE '^iconv$' \
-	&& php -m | grep -oiE '^interbase$' \
-	&& php-fpm -m | grep -oiE '^interbase$' \
 	&& php -m | grep -oiE '^intl$' \
 	&& php-fpm -m | grep -oiE '^intl$' \
 	&& php -m | grep -oiE '^json$' \
@@ -544,6 +555,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^tidy$' \
 	&& php -m | grep -oiE '^tokenizer$' \
 	&& php-fpm -m | grep -oiE '^tokenizer$' \
+	&& php -m | grep -oiE '^uploadprogress$' \
+	&& php-fpm -m | grep -oiE '^uploadprogress$' \
 	&& php -m | grep -oiE '^xml$' \
 	&& php-fpm -m | grep -oiE '^xml$' \
 	&& php -m | grep -oiE '^xmlreader$' \

Dockerfiles/work/Dockerfile-5.2

@@ -327,7 +327,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-5.3

@@ -368,7 +368,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-5.4

@@ -397,7 +397,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-5.5

@@ -412,7 +412,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-5.6

@@ -424,7 +424,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-7.0

@@ -424,7 +424,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-7.1

@@ -424,7 +424,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-7.2

@@ -424,7 +424,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-7.3

@@ -413,7 +413,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-7.4

@@ -409,7 +409,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

Dockerfiles/work/Dockerfile-8.0

@@ -340,7 +340,7 @@ RUN set -x \
 # mdl
 	&& gem install mdl \
 # scss_lint
-	&& gem install scss_lint \
+	&& gem install scss_lint -v 0.57.1 \
 # sass
 	&& gem install sass \
 	\

README.md

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

build/ansible/group_vars/all/mods.yml

@@ -356,6 +356,7 @@ extensions_available:
       build_dep: [libc-client-dev, libkrb5-dev, libcurl4-openssl-dev]
       run_dep: [libc-client2007e]
   interbase:
+    disabled: [7.4, 8.0]   # TODO: re-enable. currently not available anymore on 7.4 and 8.0
     all:
       type: builtin
       build_dep: [libfbclient2, libib-util, firebird-dev]
@@ -903,7 +904,6 @@ extensions_available:
   tokenizer:
     already_avail: "{{ php_all_versions }}"
   uploadprogress:
-    disabled: [8.0] #TODO: fixme
     7.0:
       type: git
       git_url: https://github.com/php/pecl-php-uploadprogress
@@ -927,7 +927,17 @@ extensions_available:
     8.0:
       type: git
       git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
+      command: |
+        true \
+        # FIXME: This is a work-around to mitigate compile error with PHP 8.0
+        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
+        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
+        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
+        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
+        && phpize \
+        && ./configure --enable-uploadprogress \
+        && make \
+        && make install \
     all:
       type: pecl
   wddx:

build/ansible/group_vars/all/work.yml

@@ -279,6 +279,8 @@ gem_available:
     check: mdl --version | grep -E '[.0-9]+'
   scss_lint:
     name: scss_lint
+    all:
+      version: 0.57.1
   sass:
     name: sass
     check: sass --version | grep -E '[.0-9]+'