Merge pull request #115 from devilbox/release-0.87

cytopia · web-flow · commit 3075f2afcaac · 2019-05-12T15:08:00.000+02:00
Fix scss_lint install
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/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$' \
diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/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) \
@@ -477,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$' \
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/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 \
 	\
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/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 \
 	\
diff --git a/README.md b/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, uploadprogress, 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>
diff --git a/build/ansible/group_vars/all/mods.yml b/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]
diff --git a/build/ansible/group_vars/all/work.yml b/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]+'

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ RUN set -x \`
`327`	`327`	`# mdl`
`328`	`328`	`&& gem install mdl \`
`329`	`329`	`# scss_lint`
`330`		`- && gem install scss_lint \`
	`330`	`+ && gem install scss_lint -v 0.57.1 \`
`331`	`331`	`# sass`
`332`	`332`	`&& gem install sass \`
`333`	`333`	`\`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ RUN set -x \`
`368`	`368`	`# mdl`
`369`	`369`	`&& gem install mdl \`
`370`	`370`	`# scss_lint`
`371`		`- && gem install scss_lint \`
	`371`	`+ && gem install scss_lint -v 0.57.1 \`
`372`	`372`	`# sass`
`373`	`373`	`&& gem install sass \`
`374`	`374`	`\`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ RUN set -x \`
`397`	`397`	`# mdl`
`398`	`398`	`&& gem install mdl \`
`399`	`399`	`# scss_lint`
`400`		`- && gem install scss_lint \`
	`400`	`+ && gem install scss_lint -v 0.57.1 \`
`401`	`401`	`# sass`
`402`	`402`	`&& gem install sass \`
`403`	`403`	`\`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ RUN set -x \`
`412`	`412`	`# mdl`
`413`	`413`	`&& gem install mdl \`
`414`	`414`	`# scss_lint`
`415`		`- && gem install scss_lint \`
	`415`	`+ && gem install scss_lint -v 0.57.1 \`
`416`	`416`	`# sass`
`417`	`417`	`&& gem install sass \`
`418`	`418`	`\`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ RUN set -x \`
`424`	`424`	`# mdl`
`425`	`425`	`&& gem install mdl \`
`426`	`426`	`# scss_lint`
`427`		`- && gem install scss_lint \`
	`427`	`+ && gem install scss_lint -v 0.57.1 \`
`428`	`428`	`# sass`
`429`	`429`	`&& gem install sass \`
`430`	`430`	`\`