From 8b9da99a601a1e161f9ecc76b323b079c8e87821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 23 Jan 2026 16:07:47 +0100 Subject: [PATCH 1/5] IBX-10495: [Backport] Included Elasticsearch 8 on CI --- docker/elastic8.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 docker/elastic8.yml diff --git a/docker/elastic8.yml b/docker/elastic8.yml new file mode 100644 index 0000000..755f0df --- /dev/null +++ b/docker/elastic8.yml @@ -0,0 +1,28 @@ +# Elastic config, to be appended after base-prod or base-dev, ..., but before selenium.yml +# +# NOTE: You'll need to manually run the command: php bin/console ibexa:elasticsearch:put-index-template. + +## WARNING! +# This service is currently work in progress, is not tested by CI, and thus not guaranteed to work. +# You are however more then welcome to try it out and help make it stable. + +services: + app: + depends_on: + - elasticsearch + environment: + - SEARCH_ENGINE=elasticsearch + - ELASTICSEARCH_DSN=elasticsearch:9200 + + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:8.19.9 + ports: + - "9200:9200" + - "9300:9300" + environment: + - discovery.type=single-node + - xpack.security.enabled=false + - xpack.security.http.ssl.enabled=false + networks: + - frontend + - backend From 21c48c288a7cd3ffc733267c7b34d821f3cd4346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 23 Jan 2026 16:37:44 +0100 Subject: [PATCH 2/5] Fixed CI --- php/Dockerfile-node12 | 15 +++++++++------ php/Dockerfile-node14 | 15 +++++++++------ php/Dockerfile-node16 | 15 +++++++++------ php/Dockerfile-node18 | 15 +++++++++------ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/php/Dockerfile-node12 b/php/Dockerfile-node12 index 8c58ba4..4f37142 100644 --- a/php/Dockerfile-node12 +++ b/php/Dockerfile-node12 @@ -1,11 +1,14 @@ FROM ibexa_php:latest # Install Node.js and Yarn -RUN apt-get update -q -y \ - && apt-get install -q -y --no-install-recommends gnupg \ - && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ +RUN apt-get update -y \ + && apt-get install -y --no-install-recommends \ + ca-certificates curl gnupg \ + \ + && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs \ - && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && sudo apt-get update && sudo apt-get install yarn \ + \ + && corepack enable \ + && corepack prepare yarn@stable --activate \ + \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node14 b/php/Dockerfile-node14 index dbbf237..5e91128 100644 --- a/php/Dockerfile-node14 +++ b/php/Dockerfile-node14 @@ -1,11 +1,14 @@ FROM ibexa_php:latest # Install Node.js and Yarn -RUN apt-get update -q -y \ - && apt-get install -q -y --no-install-recommends gnupg \ - && curl -sL https://deb.nodesource.com/setup_14.x | bash - \ +RUN apt-get update -y \ + && apt-get install -y --no-install-recommends \ + ca-certificates curl gnupg \ + \ + && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ && apt-get install -y nodejs \ - && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && sudo apt-get update && sudo apt-get install yarn \ + \ + && corepack enable \ + && corepack prepare yarn@stable --activate \ + \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node16 b/php/Dockerfile-node16 index be7fe83..dbcfc3d 100644 --- a/php/Dockerfile-node16 +++ b/php/Dockerfile-node16 @@ -1,11 +1,14 @@ FROM ibexa_php:latest # Install Node.js and Yarn -RUN apt-get update -q -y \ - && apt-get install -q -y --no-install-recommends gnupg \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ +RUN apt-get update -y \ + && apt-get install -y --no-install-recommends \ + ca-certificates curl gnupg \ + \ + && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs \ - && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && sudo apt-get update && sudo apt-get install yarn \ + \ + && corepack enable \ + && corepack prepare yarn@stable --activate \ + \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node18 b/php/Dockerfile-node18 index 7babd07..70a9633 100644 --- a/php/Dockerfile-node18 +++ b/php/Dockerfile-node18 @@ -1,11 +1,14 @@ FROM ibexa_php:latest # Install Node.js and Yarn -RUN apt-get update -q -y \ - && apt-get install -q -y --no-install-recommends gnupg \ - && curl -sL https://deb.nodesource.com/setup_18.x | bash - \ +RUN apt-get update -y \ + && apt-get install -y --no-install-recommends \ + ca-certificates curl gnupg \ + \ + && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \ && apt-get install -y nodejs \ - && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && sudo apt-get update && sudo apt-get install yarn \ + \ + && corepack enable \ + && corepack prepare yarn@stable --activate \ + \ && rm -rf /var/lib/apt/lists/* From 42a660d8ce8fbb7b3b964a82a3b2aed6b6d01845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 28 Jan 2026 16:29:27 +0100 Subject: [PATCH 3/5] Fixed CI (Node 14) --- php/Dockerfile-node14 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php/Dockerfile-node14 b/php/Dockerfile-node14 index 5e91128..05daca6 100644 --- a/php/Dockerfile-node14 +++ b/php/Dockerfile-node14 @@ -3,12 +3,12 @@ FROM ibexa_php:latest # Install Node.js and Yarn RUN apt-get update -y \ && apt-get install -y --no-install-recommends \ - ca-certificates curl gnupg \ + ca-certificates curl gnupg xz-utils \ \ - && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get install -y nodejs \ + && curl -fsSL https://nodejs.org/dist/v14.21.3/node-v14.21.3-linux-x64.tar.xz \ + | tar -xJ -C /usr/local --strip-components=1 \ \ && corepack enable \ - && corepack prepare yarn@stable --activate \ + && corepack prepare yarn@1.22.22 --activate \ \ && rm -rf /var/lib/apt/lists/* From 7fd1b6352165f2e094b68ddf33cb1088fa9b8df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 28 Jan 2026 16:31:49 +0100 Subject: [PATCH 4/5] Fixed CI (Node 12) --- php/Dockerfile-node12 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/php/Dockerfile-node12 b/php/Dockerfile-node12 index 4f37142..9bbfcd4 100644 --- a/php/Dockerfile-node12 +++ b/php/Dockerfile-node12 @@ -3,12 +3,14 @@ FROM ibexa_php:latest # Install Node.js and Yarn RUN apt-get update -y \ && apt-get install -y --no-install-recommends \ - ca-certificates curl gnupg \ + ca-certificates curl xz-utils \ \ - && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ - && apt-get install -y nodejs \ + && curl -fsSL https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \ + | tar -xJ -C /usr/local --strip-components=1 \ \ - && corepack enable \ - && corepack prepare yarn@stable --activate \ + && node -v \ + && npm -v \ + \ + && npm install -g yarn@1.22.19 \ \ && rm -rf /var/lib/apt/lists/* From ea4ce0b9adf05ff06a9378b222cb37c77d18a105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 28 Jan 2026 16:38:45 +0100 Subject: [PATCH 5/5] Fixed CI (Node 16) --- php/Dockerfile-node16 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/php/Dockerfile-node16 b/php/Dockerfile-node16 index dbcfc3d..dd005ad 100644 --- a/php/Dockerfile-node16 +++ b/php/Dockerfile-node16 @@ -8,7 +8,9 @@ RUN apt-get update -y \ && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs \ \ - && corepack enable \ - && corepack prepare yarn@stable --activate \ + && npm install -g yarn@1.22.22 \ + \ + && node -v \ + && yarn -v \ \ && rm -rf /var/lib/apt/lists/*