From a90a2babb95066ca05c22e92873d8e06b8372391 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Sat, 22 Aug 2020 17:20:31 -0300 Subject: [PATCH 01/10] bash unofficial defaults --- php/scripts/alpine/cleanup.sh | 2 +- php/scripts/alpine/extensions.sh | 2 +- php/scripts/alpine/nodeyarn.sh | 2 ++ php/scripts/alpine/packages.sh | 2 +- php/scripts/chromium.sh | 2 +- php/scripts/cleanup.sh | 2 ++ php/scripts/extensions.sh | 2 +- php/scripts/node.sh | 2 +- php/scripts/packages.sh | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/php/scripts/alpine/cleanup.sh b/php/scripts/alpine/cleanup.sh index 23f19d63..52ef16cf 100644 --- a/php/scripts/alpine/cleanup.sh +++ b/php/scripts/alpine/cleanup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail apk del --purge grep build-base file openssl-dev diff --git a/php/scripts/alpine/extensions.sh b/php/scripts/alpine/extensions.sh index 5d6f0709..d817778d 100644 --- a/php/scripts/alpine/extensions.sh +++ b/php/scripts/alpine/extensions.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail apk --update --no-cache add \ bzip2 \ diff --git a/php/scripts/alpine/nodeyarn.sh b/php/scripts/alpine/nodeyarn.sh index 49ce5fa4..e3b0bfb7 100644 --- a/php/scripts/alpine/nodeyarn.sh +++ b/php/scripts/alpine/nodeyarn.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -euo pipefail + ln -s /usr/lib/npm/bin/npm-cli.js /usr/bin/npm npm i -g npm@${NPM_VERSION} diff --git a/php/scripts/alpine/packages.sh b/php/scripts/alpine/packages.sh index 27671b15..d314804f 100644 --- a/php/scripts/alpine/packages.sh +++ b/php/scripts/alpine/packages.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail apk --update --no-cache add \ g++ \ diff --git a/php/scripts/chromium.sh b/php/scripts/chromium.sh index f6d52572..9fc4d31b 100644 --- a/php/scripts/chromium.sh +++ b/php/scripts/chromium.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -euf -o pipefail +set -euo pipefail # Installing Chromium for Dusk DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ diff --git a/php/scripts/cleanup.sh b/php/scripts/cleanup.sh index d582d6f9..db918d35 100644 --- a/php/scripts/cleanup.sh +++ b/php/scripts/cleanup.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -euo pipefail + apt-get purge -yqq --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \ apt-utils \ build-essential \ diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index 972aca83..5cc9e031 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail extensions=" \ bcmath \ diff --git a/php/scripts/node.sh b/php/scripts/node.sh index b3d19db4..41957d74 100644 --- a/php/scripts/node.sh +++ b/php/scripts/node.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail # NODE JS curl -sL https://deb.nodesource.com/setup_12.x | bash - \ diff --git a/php/scripts/packages.sh b/php/scripts/packages.sh index a5e4ba1a..80a4e0b4 100644 --- a/php/scripts/packages.sh +++ b/php/scripts/packages.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euf -o pipefail +set -euo pipefail ############################################################ # Speedup DPKG and don't use cache for packages From 6bf4a039e884946eb2f3d7f23dbe606aecac7979 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Thu, 10 Sep 2020 17:56:19 -0300 Subject: [PATCH 02/10] libmemcached --- php/scripts/extensions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index 5cc9e031..3177a805 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -38,6 +38,7 @@ if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "7.3" || $PHP_VERSION == "7.2" ]] libldap2-dev \ libmagickwand-dev \ libmemcached-dev \ + libmemcached \ libmemcachedutil2 \ libpng-dev \ libpq-dev \ @@ -66,6 +67,7 @@ else libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ + libmemcached \ libmemcachedutil2 \ libpng-dev \ libpq-dev \ From 8b18dc51ee06a1a18e42fda2314240aba084f9f0 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 05:16:35 -0300 Subject: [PATCH 03/10] remove cassandra extension --- php/scripts/extensions.sh | 28 ++++++++++++++-------------- php/scripts/packages.sh | 1 + tests/goss-7.2-3-lts.yaml | 1 - tests/goss-7.2.yaml | 1 - tests/goss-7.3.yaml | 1 - tests/goss-7.4.yaml | 1 - tests/goss-lts.yaml | 1 - 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index 3177a805..687c031e 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -105,20 +105,20 @@ else && docker-php-source delete fi -docker-php-source extract \ - && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \ - && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \ - && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ - && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ - && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \ - && mkdir /tmp/cassandra \ - && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \ - && rm -r /tmp/cassandra.tar.gz \ - && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \ - && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \ - && rm -rf /tmp/cassandra \ - && docker-php-ext-install cassandra \ - && docker-php-source delete +# docker-php-source extract \ +# && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \ +# && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \ +# && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ +# && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ +# && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \ +# && mkdir /tmp/cassandra \ +# && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \ +# && rm -r /tmp/cassandra.tar.gz \ +# && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \ +# && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \ +# && rm -rf /tmp/cassandra \ +# && docker-php-ext-install cassandra \ +# && docker-php-source delete if [[ $PHP_VERSION == "7.2" ]]; then docker-php-source extract \ diff --git a/php/scripts/packages.sh b/php/scripts/packages.sh index 80a4e0b4..56d83b42 100644 --- a/php/scripts/packages.sh +++ b/php/scripts/packages.sh @@ -18,6 +18,7 @@ echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf DEBIAN_FRONTEND=noninteractive dpkg-reconfigure -f noninteractive tzdata \ && apt-get update \ + && apt-get upgrade \ && DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ apt-transport-https \ apt-utils \ diff --git a/tests/goss-7.2-3-lts.yaml b/tests/goss-7.2-3-lts.yaml index 41a34aa4..e1ac2c49 100644 --- a/tests/goss-7.2-3-lts.yaml +++ b/tests/goss-7.2-3-lts.yaml @@ -38,7 +38,6 @@ command: - bcmath - bz2 - calendar - - cassandra - exif - gd - gmp diff --git a/tests/goss-7.2.yaml b/tests/goss-7.2.yaml index 1b257940..671afdbc 100644 --- a/tests/goss-7.2.yaml +++ b/tests/goss-7.2.yaml @@ -42,7 +42,6 @@ command: - bcmath - bz2 - calendar - - cassandra - exif - gd - gmp diff --git a/tests/goss-7.3.yaml b/tests/goss-7.3.yaml index af31b917..5874e955 100644 --- a/tests/goss-7.3.yaml +++ b/tests/goss-7.3.yaml @@ -42,7 +42,6 @@ command: - bcmath - bz2 - calendar - - cassandra - exif - gd - gmp diff --git a/tests/goss-7.4.yaml b/tests/goss-7.4.yaml index c8a893bf..e1935c04 100644 --- a/tests/goss-7.4.yaml +++ b/tests/goss-7.4.yaml @@ -42,7 +42,6 @@ command: - bcmath - bz2 - calendar - - cassandra - exif - gd - gmp diff --git a/tests/goss-lts.yaml b/tests/goss-lts.yaml index 7a3b83eb..145476b9 100644 --- a/tests/goss-lts.yaml +++ b/tests/goss-lts.yaml @@ -42,7 +42,6 @@ command: - bcmath - bz2 - calendar - - cassandra - exif - gd - gmp From a15e507e3ddac0ec14824e52e946ff7601b1adee Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 05:43:01 -0300 Subject: [PATCH 04/10] fix some broken scripts --- php/scripts/chromium.sh | 2 +- php/scripts/cleanup.sh | 6 ++-- php/scripts/extensions.sh | 72 +++++++++++++++++++-------------------- php/scripts/node.sh | 2 +- php/scripts/packages.sh | 8 ++--- 5 files changed, 44 insertions(+), 46 deletions(-) diff --git a/php/scripts/chromium.sh b/php/scripts/chromium.sh index 9fc4d31b..50ff9aaf 100644 --- a/php/scripts/chromium.sh +++ b/php/scripts/chromium.sh @@ -3,7 +3,7 @@ set -euo pipefail # Installing Chromium for Dusk -DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ +DEBIAN_FRONTEND=noninteractive apt-get install -yq \ libgconf-2-4 \ libnss3 \ libxi6 \ diff --git a/php/scripts/cleanup.sh b/php/scripts/cleanup.sh index db918d35..ac89aae4 100644 --- a/php/scripts/cleanup.sh +++ b/php/scripts/cleanup.sh @@ -2,7 +2,7 @@ set -euo pipefail -apt-get purge -yqq --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \ +apt-get purge -yq --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \ apt-utils \ build-essential \ dpkg-dev \ @@ -14,7 +14,7 @@ apt-get purge -yqq --auto-remove -o APT::AutoRemove::RecommendsImportant=false - re2c \ wget -apt-get autoremove -yqq --purge -apt-get autoclean -yqq +apt-get autoremove -yq --purge +apt-get autoclean -yq apt-get clean rm -rf /var/cache/apt/ /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* /usr/share/doc /usr/share/doc-base /usr/share/groff/* /usr/share/info/* /usr/share/linda/* /usr/share/lintian/overrides/* /usr/share/locale/* /usr/share/man/* /usr/share/locale/* /usr/share/gnome/help/*/* /usr/share/doc/kde/HTML/*/* /usr/share/omf/*/*-*.emf diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index 687c031e..e0ca6315 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -2,33 +2,35 @@ set -euo pipefail -extensions=" \ -bcmath \ -bz2 \ -calendar \ -exif \ -gmp \ -intl \ -mysqli \ -opcache \ -pcntl \ -pdo_mysql \ -pdo_pgsql \ -pgsql \ -soap \ -xmlrpc \ -xsl \ -zip -" +export extensions=" \ + bcmath \ + bz2 \ + calendar \ + exif \ + gmp \ + intl \ + mysqli \ + opcache \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + xmlrpc \ + xsl \ + zip + " if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "7.3" || $PHP_VERSION == "7.2" ]]; then - buildDeps=" \ + +export buildDeps=" \ default-libmysqlclient-dev \ libbz2-dev \ libsasl2-dev \ pkg-config \ - " \ - runtimeDeps=" \ + " + +export runtimeDeps=" \ imagemagick \ libfreetype6-dev \ libgmp-dev \ @@ -38,7 +40,6 @@ if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "7.3" || $PHP_VERSION == "7.2" ]] libldap2-dev \ libmagickwand-dev \ libmemcached-dev \ - libmemcached \ libmemcachedutil2 \ libpng-dev \ libpq-dev \ @@ -51,12 +52,14 @@ if [[ $PHP_VERSION == "7.4" || $PHP_VERSION == "7.3" || $PHP_VERSION == "7.2" ]] multiarch-support \ " else - buildDeps=" \ + +export buildDeps=" \ default-libmysqlclient-dev \ libbz2-dev \ libsasl2-dev \ - " \ - runtimeDeps=" \ + " + +export runtimeDeps=" \ imagemagick \ libfreetype6-dev \ libgmp-dev \ @@ -67,7 +70,6 @@ else libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ - libmemcached \ libmemcachedutil2 \ libpng-dev \ libpq-dev \ @@ -79,12 +81,14 @@ else " fi +apt-get update \ + && apt-get install -yq $buildDeps \ + && apt-get install -yq $runtimeDeps \ + && rm -rf /var/lib/apt/lists/* \ + && docker-php-ext-install -j$(nproc) $extensions + if [[ $PHP_VERSION == "7.4" ]]; then - DEBIAN_FRONTEND=noninteractive apt-get install -yqq $buildDeps \ - && DEBIAN_FRONTEND=noninteractive apt-get install -yqq $runtimeDeps \ - && rm -rf /var/lib/apt/lists/* \ - && docker-php-ext-install -j$(nproc) $extensions \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ + docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install -j$(nproc) ldap \ @@ -92,11 +96,7 @@ if [[ $PHP_VERSION == "7.4" ]]; then && docker-php-ext-install -j$(nproc) imap \ && docker-php-source delete else - DEBIAN_FRONTEND=noninteractive apt-get install -yqq $buildDeps \ - && DEBIAN_FRONTEND=noninteractive apt-get install -yqq $runtimeDeps \ - && rm -rf /var/lib/apt/lists/* \ - && docker-php-ext-install -j$(nproc) $extensions \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install -j$(nproc) ldap \ diff --git a/php/scripts/node.sh b/php/scripts/node.sh index 41957d74..80d7b952 100644 --- a/php/scripts/node.sh +++ b/php/scripts/node.sh @@ -4,7 +4,7 @@ set -euo pipefail # NODE JS curl -sL https://deb.nodesource.com/setup_12.x | bash - \ - && DEBIAN_FRONTEND=noninteractive apt-get install nodejs -yqq \ + && DEBIAN_FRONTEND=noninteractive apt-get install nodejs -yq \ && npm i -g npm \ && curl -o- -L https://yarnpkg.com/install.sh | bash \ && npm cache clean --force diff --git a/php/scripts/packages.sh b/php/scripts/packages.sh index 56d83b42..06ad9297 100644 --- a/php/scripts/packages.sh +++ b/php/scripts/packages.sh @@ -10,20 +10,18 @@ set -euo pipefail # this forces dpkg not to call sync() after package extraction and speeds up # install echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup -# # we don't need and apt cache in a container echo "Acquire::http {No-Cache=True;};" > /etc/apt/apt.conf.d/no-cache echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf +export DEBIAN_FRONTEND=noninteractive -DEBIAN_FRONTEND=noninteractive dpkg-reconfigure -f noninteractive tzdata \ && apt-get update \ - && apt-get upgrade \ - && DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ + && apt-get install -yq \ apt-transport-https \ apt-utils \ ca-certificates \ - && DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ + && apt-get install -yq \ build-essential \ curl \ git \ From 96a3f382b1216ff0f184af052135b35d44cc450c Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 05:51:38 -0300 Subject: [PATCH 05/10] bring cassandra back --- php/scripts/extensions.sh | 28 ++++++++++++++-------------- tests/goss-7.2-3-lts.yaml | 1 + tests/goss-7.2.yaml | 1 + tests/goss-7.3.yaml | 1 + tests/goss-7.4.yaml | 1 + tests/goss-lts.yaml | 1 + 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index e0ca6315..e2a94e9f 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -105,20 +105,20 @@ else && docker-php-source delete fi -# docker-php-source extract \ -# && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \ -# && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \ -# && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ -# && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ -# && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \ -# && mkdir /tmp/cassandra \ -# && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \ -# && rm -r /tmp/cassandra.tar.gz \ -# && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \ -# && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \ -# && rm -rf /tmp/cassandra \ -# && docker-php-ext-install cassandra \ -# && docker-php-source delete +docker-php-source extract \ + && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \ + && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \ + && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ + && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \ + && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \ + && mkdir /tmp/cassandra \ + && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \ + && rm -r /tmp/cassandra.tar.gz \ + && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \ + && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \ + && rm -rf /tmp/cassandra \ + && docker-php-ext-install cassandra \ + && docker-php-source delete if [[ $PHP_VERSION == "7.2" ]]; then docker-php-source extract \ diff --git a/tests/goss-7.2-3-lts.yaml b/tests/goss-7.2-3-lts.yaml index e1ac2c49..41a34aa4 100644 --- a/tests/goss-7.2-3-lts.yaml +++ b/tests/goss-7.2-3-lts.yaml @@ -38,6 +38,7 @@ command: - bcmath - bz2 - calendar + - cassandra - exif - gd - gmp diff --git a/tests/goss-7.2.yaml b/tests/goss-7.2.yaml index 671afdbc..1b257940 100644 --- a/tests/goss-7.2.yaml +++ b/tests/goss-7.2.yaml @@ -42,6 +42,7 @@ command: - bcmath - bz2 - calendar + - cassandra - exif - gd - gmp diff --git a/tests/goss-7.3.yaml b/tests/goss-7.3.yaml index 5874e955..af31b917 100644 --- a/tests/goss-7.3.yaml +++ b/tests/goss-7.3.yaml @@ -42,6 +42,7 @@ command: - bcmath - bz2 - calendar + - cassandra - exif - gd - gmp diff --git a/tests/goss-7.4.yaml b/tests/goss-7.4.yaml index e1935c04..c8a893bf 100644 --- a/tests/goss-7.4.yaml +++ b/tests/goss-7.4.yaml @@ -42,6 +42,7 @@ command: - bcmath - bz2 - calendar + - cassandra - exif - gd - gmp diff --git a/tests/goss-lts.yaml b/tests/goss-lts.yaml index 145476b9..7a3b83eb 100644 --- a/tests/goss-lts.yaml +++ b/tests/goss-lts.yaml @@ -42,6 +42,7 @@ command: - bcmath - bz2 - calendar + - cassandra - exif - gd - gmp From 84942604ed29bfd19b62fdacafb8f908d5e3f80a Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 05:55:30 -0300 Subject: [PATCH 06/10] npm madness https://github.com/npm/cli/issues/611 --- php/scripts/alpine/nodeyarn.sh | 2 +- php/scripts/node.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/scripts/alpine/nodeyarn.sh b/php/scripts/alpine/nodeyarn.sh index e3b0bfb7..a1f74a7c 100644 --- a/php/scripts/alpine/nodeyarn.sh +++ b/php/scripts/alpine/nodeyarn.sh @@ -4,7 +4,7 @@ set -euo pipefail ln -s /usr/lib/npm/bin/npm-cli.js /usr/bin/npm -npm i -g npm@${NPM_VERSION} +npm i -g --force npm@${NPM_VERSION} curl -o- -L https://yarnpkg.com/install.sh | bash diff --git a/php/scripts/node.sh b/php/scripts/node.sh index 80d7b952..20f228f8 100644 --- a/php/scripts/node.sh +++ b/php/scripts/node.sh @@ -5,7 +5,7 @@ set -euo pipefail # NODE JS curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && DEBIAN_FRONTEND=noninteractive apt-get install nodejs -yq \ - && npm i -g npm \ + && npm i -g --force npm \ && curl -o- -L https://yarnpkg.com/install.sh | bash \ && npm cache clean --force From 1a456604e37c41cc2c07730f67b3c0cebf6bb630 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 06:31:53 -0300 Subject: [PATCH 07/10] npm madness https://github.com/npm/cli/issues/611 --- php/scripts/alpine/nodeyarn.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/php/scripts/alpine/nodeyarn.sh b/php/scripts/alpine/nodeyarn.sh index a1f74a7c..41fccb37 100644 --- a/php/scripts/alpine/nodeyarn.sh +++ b/php/scripts/alpine/nodeyarn.sh @@ -8,8 +8,6 @@ npm i -g --force npm@${NPM_VERSION} curl -o- -L https://yarnpkg.com/install.sh | bash -mkdir $HOME/.config - rm -rf /usr/share/man /var/cache/apk/* \ /root/.npm /root/.node-gyp /root/.gnupg /usr/lib/node_modules/npm/man \ /usr/lib/node_modules/npm/doc /usr/lib/node_modules/npm/html /usr/lib/node_modules/npm/scripts From 2e59517d704a3f7b6bfad0447b8c3a5b9907f2f5 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 15:01:10 -0300 Subject: [PATCH 08/10] remove some foldersfrom cleanup script --- php/scripts/alpine/cleanup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/php/scripts/alpine/cleanup.sh b/php/scripts/alpine/cleanup.sh index 52ef16cf..d2c1b59b 100644 --- a/php/scripts/alpine/cleanup.sh +++ b/php/scripts/alpine/cleanup.sh @@ -7,6 +7,5 @@ apk del --purge grep build-base file openssl-dev rm -rf /tmp/* \ /usr/includes/* \ /usr/share/man/* \ - /usr/src/* \ /var/cache/apk/* \ /var/tmp/* From 53f9b6973d2a6c407718a4dd655e02ebbeadb00a Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 18:02:49 -0300 Subject: [PATCH 09/10] fix chromium script --- php/scripts/chromium.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/php/scripts/chromium.sh b/php/scripts/chromium.sh index 50ff9aaf..a0f80c4a 100644 --- a/php/scripts/chromium.sh +++ b/php/scripts/chromium.sh @@ -3,7 +3,8 @@ set -euo pipefail # Installing Chromium for Dusk -DEBIAN_FRONTEND=noninteractive apt-get install -yq \ +apt-get update \ + && apt-get install -yq \ libgconf-2-4 \ libnss3 \ libxi6 \ From f8ee01ccb5d35c5449f921844ba16b56b115ea65 Mon Sep 17 00:00:00 2001 From: Eduardo Bizarro Date: Fri, 11 Sep 2020 18:47:25 -0300 Subject: [PATCH 10/10] implement #92 --- php/scripts/extensions.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh index e2a94e9f..a3882688 100644 --- a/php/scripts/extensions.sh +++ b/php/scripts/extensions.sh @@ -46,9 +46,10 @@ export runtimeDeps=" \ librabbitmq-dev \ libssl-dev \ libuv1-dev \ + libwebp-dev \ libxml2-dev \ - libzip-dev \ libxslt1-dev \ + libzip-dev \ multiarch-support \ " else @@ -75,6 +76,7 @@ export runtimeDeps=" \ libpq-dev \ librabbitmq-dev \ libuv1-dev \ + libwebp-dev \ libxml2-dev \ mcrypt \ multiarch-support \ @@ -88,7 +90,7 @@ apt-get update \ && docker-php-ext-install -j$(nproc) $extensions if [[ $PHP_VERSION == "7.4" ]]; then - docker-php-ext-configure gd --with-freetype --with-jpeg \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install -j$(nproc) ldap \ @@ -96,7 +98,7 @@ if [[ $PHP_VERSION == "7.4" ]]; then && docker-php-ext-install -j$(nproc) imap \ && docker-php-source delete else - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install -j$(nproc) ldap \