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/3] 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/3] 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 4b721afffacf6892169aa685a450277e87c943bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 23 Jan 2026 16:46:44 +0100 Subject: [PATCH 3/3] fixup! Fixed CI --- php/Dockerfile-node12 | 10 ++++++++-- php/Dockerfile-node14 | 10 ++++++++-- php/Dockerfile-node16 | 10 ++++++++-- php/Dockerfile-node18 | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/php/Dockerfile-node12 b/php/Dockerfile-node12 index 4f37142..a406383 100644 --- a/php/Dockerfile-node12 +++ b/php/Dockerfile-node12 @@ -8,7 +8,13 @@ RUN apt-get update -y \ && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y nodejs \ \ - && corepack enable \ - && corepack prepare yarn@stable --activate \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \ + | gpg --dearmor \ + > /usr/share/keyrings/yarnkey.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \ + > /etc/apt/sources.list.d/yarn.list \ + \ + && apt-get update \ + && apt-get install -y yarn \ \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node14 b/php/Dockerfile-node14 index 5e91128..7b3c592 100644 --- a/php/Dockerfile-node14 +++ b/php/Dockerfile-node14 @@ -8,7 +8,13 @@ RUN apt-get update -y \ && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ && apt-get install -y nodejs \ \ - && corepack enable \ - && corepack prepare yarn@stable --activate \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \ + | gpg --dearmor \ + > /usr/share/keyrings/yarnkey.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \ + > /etc/apt/sources.list.d/yarn.list \ + \ + && apt-get update \ + && apt-get install -y yarn \ \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node16 b/php/Dockerfile-node16 index dbcfc3d..d0971da 100644 --- a/php/Dockerfile-node16 +++ b/php/Dockerfile-node16 @@ -8,7 +8,13 @@ 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \ + | gpg --dearmor \ + > /usr/share/keyrings/yarnkey.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \ + > /etc/apt/sources.list.d/yarn.list \ + \ + && apt-get update \ + && apt-get install -y yarn \ \ && rm -rf /var/lib/apt/lists/* diff --git a/php/Dockerfile-node18 b/php/Dockerfile-node18 index 70a9633..9f2b735 100644 --- a/php/Dockerfile-node18 +++ b/php/Dockerfile-node18 @@ -8,7 +8,13 @@ RUN apt-get update -y \ && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \ && apt-get install -y nodejs \ \ - && corepack enable \ - && corepack prepare yarn@stable --activate \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \ + | gpg --dearmor \ + > /usr/share/keyrings/yarnkey.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \ + > /etc/apt/sources.list.d/yarn.list \ + \ + && apt-get update \ + && apt-get install -y yarn \ \ && rm -rf /var/lib/apt/lists/*