From 166506cfeb5ec9b89eff966d0a762ee9b80e924d Mon Sep 17 00:00:00 2001
From: Bartek Wajda <bartlomiej.wajda@ibexa.co>
Date: Mon, 14 Sep 2026 20:49:29 +0200
Subject: [PATCH 1/3] IBX-12271: Migrated Solr image to version 10.0

---
 .github/workflows/backend-ci.yaml      |  3 ++-
 .github/workflows/gha-docker-solr.yaml |  8 +++++---
 docker/solr/Dockerfile                 | 10 +++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml
index 3111203e64..0b2118afa7 100644
--- a/.github/workflows/backend-ci.yaml
+++ b/.github/workflows/backend-ci.yaml
@@ -205,7 +205,7 @@ jobs:
                 options:
                     --memory=60m
             solr:
-                image: ghcr.io/ibexa/core/solr
+                image: ghcr.io/ibexa/core/solr:6.0
                 ports:
                     - 8983:8983
                 options: >-
@@ -249,3 +249,4 @@ jobs:
                     CUSTOM_CACHE_POOL: singleredis
                     CACHE_HOST: 127.0.0.1
                     CORES_SETUP: single
+                    SOLR_VERSION: 10.0.0
diff --git a/.github/workflows/gha-docker-solr.yaml b/.github/workflows/gha-docker-solr.yaml
index 4b8c29b57c..e8f828d845 100644
--- a/.github/workflows/gha-docker-solr.yaml
+++ b/.github/workflows/gha-docker-solr.yaml
@@ -12,6 +12,7 @@ on:
 
 env:
   IMAGE_NAME: ghcr.io/ibexa/core/solr
+  IMAGE_TAG: "6.0"
 
 jobs:
     build-and-publish:
@@ -34,13 +35,13 @@ jobs:
                   fetch-depth: 0
 
             - name: Build Solr image
-              run: docker build -t "$IMAGE_NAME:latest" docker/solr
+              run: docker build -t "$IMAGE_NAME:$IMAGE_TAG" docker/solr
 
             - name: Start Solr image
               run: |
                 docker run --health-cmd "solr status" \
                 --health-interval 10s --health-timeout 5s --health-retries 10 \
-                -d -p 8983:8983 "$IMAGE_NAME:latest"
+                -d -p 8983:8983 "$IMAGE_NAME:$IMAGE_TAG"
 
             - uses: ibexa/gh-workflows/actions/setup-composer-root-version@main
             
@@ -64,6 +65,7 @@ jobs:
                     CUSTOM_CACHE_POOL: singleredis
                     CACHE_HOST: 127.0.0.1
                     CORES_SETUP: single
+                    SOLR_VERSION: 10.0.0
 
             - name: Log in to the Container registry
               uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
@@ -74,4 +76,4 @@ jobs:
 
             - name: Push image
               if: ${{ matrix.php-version == '8.4' }}
-              run: docker push "$IMAGE_NAME"
+              run: docker push "$IMAGE_NAME:$IMAGE_TAG"
diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
index 987dfd5d7f..ad9339487f 100644
--- a/docker/solr/Dockerfile
+++ b/docker/solr/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.18.5 as builder
+FROM alpine:3.22 as builder
 RUN apk add --no-cache --upgrade bash git curl
 RUN adduser --disabled-password user
 USER user
 WORKDIR /home/user
-RUN git clone --depth=1 https://github.com/ibexa/solr.git solr
-RUN ./solr/bin/generate-solr-config.sh --destination-dir=config --solr-version=8.6.3
+RUN git clone --depth=1 --branch 6.0 https://github.com/ibexa/solr.git solr
+RUN ./solr/bin/generate-solr-config.sh --destination-dir=config --solr-version=10.0.0
 
-FROM solr:8.6.3
-LABEL org.opencontainers.image.source=https://github.com/ibexa/core/blob/main/docker/solr/Dockerfile
+FROM solr:10.0.0
+LABEL org.opencontainers.image.source=https://github.com/ibexa/core/blob/6.0/docker/solr/Dockerfile
 LABEL org.opencontainers.image.description="Configured Ibexa Solr Bundle image, created by 'Build and publish Solr Docker image' GHA workflow"
 LABEL org.opencontainers.image.licenses=GPL-2.0-only
 USER root

From 549367a3018f237eb30174cf5ad5375dcbec6aff Mon Sep 17 00:00:00 2001
From: Bartek Wajda <bartlomiej.wajda@ibexa.co>
Date: Mon, 21 Sep 2026 12:54:53 +0200
Subject: [PATCH 2/3] IBX-12271: Applied review remark

---
 docker/solr/Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
index ad9339487f..5b7bbbc649 100644
--- a/docker/solr/Dockerfile
+++ b/docker/solr/Dockerfile
@@ -1,12 +1,16 @@
+ARG SOLR_VERSION=10.0.0
+
 FROM alpine:3.22 as builder
+ARG SOLR_VERSION
+ARG SOLR_BUNDLE_BRANCH=6.0
 RUN apk add --no-cache --upgrade bash git curl
 RUN adduser --disabled-password user
 USER user
 WORKDIR /home/user
-RUN git clone --depth=1 --branch 6.0 https://github.com/ibexa/solr.git solr
-RUN ./solr/bin/generate-solr-config.sh --destination-dir=config --solr-version=10.0.0
+RUN git clone --depth=1 --branch "${SOLR_BUNDLE_BRANCH}" https://github.com/ibexa/solr.git solr
+RUN ./solr/bin/generate-solr-config.sh --destination-dir=config --solr-version="${SOLR_VERSION}"
 
-FROM solr:10.0.0
+FROM solr:${SOLR_VERSION}
 LABEL org.opencontainers.image.source=https://github.com/ibexa/core/blob/6.0/docker/solr/Dockerfile
 LABEL org.opencontainers.image.description="Configured Ibexa Solr Bundle image, created by 'Build and publish Solr Docker image' GHA workflow"
 LABEL org.opencontainers.image.licenses=GPL-2.0-only

From 9b97543a7885f0720da70e18849c77fc3bb912eb Mon Sep 17 00:00:00 2001
From: Bartek Wajda <bartlomiej.wajda@ibexa.co>
Date: Mon, 21 Sep 2026 13:56:21 +0200
Subject: [PATCH 3/3] IBX-12271: Fixup

---
 docker/solr/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
index 5b7bbbc649..5086503acb 100644
--- a/docker/solr/Dockerfile
+++ b/docker/solr/Dockerfile
@@ -1,6 +1,6 @@
 ARG SOLR_VERSION=10.0.0
 
-FROM alpine:3.22 as builder
+FROM alpine:3.22 AS builder
 ARG SOLR_VERSION
 ARG SOLR_BUNDLE_BRANCH=6.0
 RUN apk add --no-cache --upgrade bash git curl