From db99957bcb5715288b4b6516ecdeb515eb8ab56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 12 Jan 2025 10:04:34 +0100 Subject: [PATCH 1/3] Test demos Dockerfile build in CI --- .github/workflows/test-unit.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 2de578992c..2fec4008f0 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -486,3 +486,14 @@ jobs: - name: Diff build baseline run: | diff -u docs/baseline.orig.txt docs/baseline.txt + + demos-dockerfile-test: + name: Demos Dockerfile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Build + run: | + (cd demos && docker build -f Dockerfile ..) From b24d123a946e79d91d51b37b1fae5322b8d25d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 12 Jan 2025 10:14:47 +0100 Subject: [PATCH 2/3] fix Dockerfile build even if the latest php is not supported --- demos/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/Dockerfile b/demos/Dockerfile index aeb0d1b13e..d2ec287aba 100644 --- a/demos/Dockerfile +++ b/demos/Dockerfile @@ -32,7 +32,7 @@ RUN cd public/css && lessc agileui.less agileui.css ADD composer.json . RUN jq 'del(."require-release")|del(."require-dev")' < composer.json > tmp && mv tmp composer.json \ && composer require --no-update fzaninotto/faker:^1.6 \ - && composer install --no-dev + && composer install --no-dev --ignore-platform-req=php RUN echo 'disable_functions = pcntl_exec,exec,passthru,proc_open,shell_exec,system,popen/g' >> "$PHP_INI_DIR/php.ini" From a4185176e2f9b81c85a5a70a9dd81fcaaf81e1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 12 Jan 2025 10:22:54 +0100 Subject: [PATCH 3/3] no jq --- demos/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/demos/Dockerfile b/demos/Dockerfile index d2ec287aba..ed03b58164 100644 --- a/demos/Dockerfile +++ b/demos/Dockerfile @@ -8,7 +8,7 @@ FROM php:apache RUN apt-get update && apt-get install -y \ - libicu-dev git jq unzip npm \ + libicu-dev git unzip npm \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && docker-php-ext-install pdo pdo_mysql @@ -30,8 +30,7 @@ RUN cd js && npm ci && npm run build RUN cd public/css && lessc agileui.less agileui.css ADD composer.json . -RUN jq 'del(."require-release")|del(."require-dev")' < composer.json > tmp && mv tmp composer.json \ - && composer require --no-update fzaninotto/faker:^1.6 \ +RUN composer require --no-update --no-interaction fzaninotto/faker:^1.6 \ && composer install --no-dev --ignore-platform-req=php RUN echo 'disable_functions = pcntl_exec,exec,passthru,proc_open,shell_exec,system,popen/g' >> "$PHP_INI_DIR/php.ini"