Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/backend-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down Expand Up @@ -249,3 +249,4 @@ jobs:
CUSTOM_CACHE_POOL: singleredis
CACHE_HOST: 127.0.0.1
CORES_SETUP: single
SOLR_VERSION: 10.0.0
8 changes: 5 additions & 3 deletions .github/workflows/gha-docker-solr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:

env:
IMAGE_NAME: ghcr.io/ibexa/core/solr
IMAGE_TAG: "6.0"

jobs:
build-and-publish:
Expand All @@ -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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to be confusing. I'm assuming latest will still exist from the last build, but it won't be "latest" anymore. Is it possible to build both $IMAGE_TAG and latest or alias one to another.

This also means that we should build on 5.0 a 5.0 version and on 4.6 a 4.6 version, though I expect them to be the same. // ah, I see already planned as follow-ups

Or do you also plan to align latest only after fixing 4.6 and 5.0? Given the use it, it would make sense.


- 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

Expand All @@ -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
Expand All @@ -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"
10 changes: 5 additions & 5 deletions docker/solr/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can 6.0 be taken from env/ARGS at runtime?

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
Expand Down
Loading