From b33807181d66a300bba7c4da4018ae21181ba0a3 Mon Sep 17 00:00:00 2001 From: "[OXID-PS] Keywan Ghadami" Date: Wed, 29 Apr 2020 14:38:29 +0200 Subject: [PATCH 1/7] added 7.4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 544f6d3..32f1efb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ["7.0","7.1","7.2","7.3"] + php: ["7.0","7.1","7.2","7.3","7.4"] steps: - uses: actions/checkout@v1 - name: enable experimental features From ce093c45f3f438e9029110cc485310255cdc90de Mon Sep 17 00:00:00 2001 From: Marc Plotz Date: Tue, 19 Jan 2021 11:34:14 +0100 Subject: [PATCH 2/7] Added php7.4 checks --- Dockerfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 522cd76..9b4769f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PHP=7.1 +ARG PHP=7.4 FROM php:$PHP-apache #libs: libjudy-dev need this for memprof ARG libs="libfreetype6 libjpeg62-turbo liblz4-tool libjudy-dev" @@ -22,7 +22,21 @@ RUN test "$PHP" != "7.0" || pecl install xdebug RUN docker-php-ext-enable xdebug # install dependencies and cleanup (needs to be one step, as else it will cache in the layer) -RUN apt-get update -y \ +RUN test "$PHP" = "7.4" || apt-get update -y \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + $RUNTIME_PACKAGE_DEPS \ + $BUILD_PACKAGE_DEPS \ + && docker-php-ext-configure gd \ + && docker-php-ext-install -j$(nproc) $PHP_EXT_DEPS \ + && pecl install $PECL_DEPS \ + && docker-php-ext-enable $PECL_DEPS \ + && docker-php-source delete \ + && apt-get clean \ + && apt-get autoremove -y \ + && apt-get purge -y --auto-remove $BUILD_PACKAGE_DEPS \ + && rm -rf /var/lib/apt/lists/* + +RUN test "$PHP" != "7.4" || apt-get update -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ $RUNTIME_PACKAGE_DEPS \ $BUILD_PACKAGE_DEPS \ From 70f5a25ca65bcf0f674954450554b3636aea56fc Mon Sep 17 00:00:00 2001 From: Marc Plotz Date: Tue, 19 Jan 2021 11:41:02 +0100 Subject: [PATCH 3/7] libonig is required by mbstring --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b4769f..4fcc8c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev" -ARG PHP_EXT_DEPS="curl json xml mbstring zip bcmath soap pdo_mysql gd mysqli" +ARG PHP_EXT_DEPS="curl json xml mbstring libonig-dev zip bcmath soap pdo_mysql gd mysqli" ARG PECL_DEPS="memprof xdebug" ARG PHP_MEMORY_LIMIT="-1" From ebdbe5180b479c798abfc6f4b1bdad4fe9444adf Mon Sep 17 00:00:00 2001 From: Marc Plotz Date: Tue, 19 Jan 2021 11:43:47 +0100 Subject: [PATCH 4/7] libonig is required by mbstring --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4fcc8c4..b36b472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev" -ARG PHP_EXT_DEPS="curl json xml mbstring libonig-dev zip bcmath soap pdo_mysql gd mysqli" +ARG PHP_EXT_DEPS="curl json xml zip bcmath soap pdo_mysql gd mysqli" ARG PECL_DEPS="memprof xdebug" ARG PHP_MEMORY_LIMIT="-1" From 8c21d77421cb4c0bdf5a5f75693f6be95db3803c Mon Sep 17 00:00:00 2001 From: Marc Plotz Date: Tue, 19 Jan 2021 11:48:31 +0100 Subject: [PATCH 5/7] Fix missing dependencies automatically --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b36b472..71f4b91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN docker-php-ext-enable xdebug # install dependencies and cleanup (needs to be one step, as else it will cache in the layer) RUN test "$PHP" = "7.4" || apt-get update -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + && DEBIAN_FRONTEND=noninteractive apt-get install -f -y --no-install-recommends \ $RUNTIME_PACKAGE_DEPS \ $BUILD_PACKAGE_DEPS \ && docker-php-ext-configure gd \ From c9afd525c24216a9852209903ad63c0445f74426 Mon Sep 17 00:00:00 2001 From: Marc Plotz Date: Tue, 19 Jan 2021 11:52:38 +0100 Subject: [PATCH 6/7] Fix missing dependencies automatically --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71f4b91..866a2ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN docker-php-ext-enable xdebug # install dependencies and cleanup (needs to be one step, as else it will cache in the layer) RUN test "$PHP" = "7.4" || apt-get update -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -f -y --no-install-recommends \ + && DEBIAN_FRONTEND=noninteractive apt-get install -yf \ $RUNTIME_PACKAGE_DEPS \ $BUILD_PACKAGE_DEPS \ && docker-php-ext-configure gd \ From 01792a85340771434fb339e6d00c445ef786eda7 Mon Sep 17 00:00:00 2001 From: "[OXID-PS] Keywan Ghadami" Date: Wed, 17 Mar 2021 10:36:55 +0100 Subject: [PATCH 7/7] dummy commit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 866a2ca..182fd55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev" + ARG PHP_EXT_DEPS="curl json xml zip bcmath soap pdo_mysql gd mysqli" ARG PECL_DEPS="memprof xdebug" ARG PHP_MEMORY_LIMIT="-1"