From eff565607f3c9379614bff107da044423332e555 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 7 May 2024 11:34:56 +0200 Subject: [PATCH 1/2] [GHA] Bumped PHP to 8.3 in gha-docker-solr.yaml workflow --- .github/workflows/gha-docker-solr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gha-docker-solr.yaml b/.github/workflows/gha-docker-solr.yaml index 2d49d29290..f4018846ae 100644 --- a/.github/workflows/gha-docker-solr.yaml +++ b/.github/workflows/gha-docker-solr.yaml @@ -42,7 +42,7 @@ jobs: - name: Setup PHP Action uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: 8.3 coverage: none - name: Add solr dependency From acb0c1ebcd31e8682182bc2775a8b551b1642590 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 7 May 2024 12:17:45 +0200 Subject: [PATCH 2/2] [Doc] Added a better description for published docker image --- docker/solr/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile index 7f00ba7387..987dfd5d7f 100644 --- a/docker/solr/Dockerfile +++ b/docker/solr/Dockerfile @@ -7,6 +7,9 @@ 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 FROM solr:8.6.3 +LABEL org.opencontainers.image.source=https://github.com/ibexa/core/blob/main/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 RUN rm -rf server/solr/configsets/_default/conf/* USER solr