Apache Solr open-source search software
Tweak nightly docker image builds (#4448)
Jan Høydahlf7094c310d33
diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.ymlindex f9f27c288da..1b3f77f7589 100644--- a/.github/workflows/docker-nightly.yml+++ b/.github/workflows/docker-nightly.yml@@ -22,73 +22,62 @@ jobs:include:# main branch - Gradle on JDK21, Docker images with JRE25- branch: main- version: 11.0.0-SNAPSHOTgradle-jdk: 21dist: full- base-image: eclipse-temurin:25-jre-jammy+ base-image: eclipse-temurin:25-jre-nobletag-suffix: ''- branch: main- version: 11.0.0-SNAPSHOTgradle-jdk: 21dist: slim- base-image: eclipse-temurin:25-jre-jammy+ base-image: eclipse-temurin:25-jre-nobletag-suffix: ''# branch_10x - Gradle on JDK21, Docker images with JRE21 (default) and JRE25- branch: branch_10x- version: 10.1.0-SNAPSHOTgradle-jdk: 21dist: full- base-image: eclipse-temurin:21-jre-jammy+ base-image: eclipse-temurin:21-jre-nobletag-suffix: ''- branch: branch_10x- version: 10.1.0-SNAPSHOTgradle-jdk: 21dist: slim- base-image: eclipse-temurin:21-jre-jammy+ base-image: eclipse-temurin:21-jre-nobletag-suffix: ''- branch: branch_10x- version: 10.1.0-SNAPSHOTgradle-jdk: 21dist: full- base-image: eclipse-temurin:25-jre-jammy+ base-image: eclipse-temurin:25-jre-nobletag-suffix: '-java25'- # branch_10_0 - Gradle on JDK21, Docker images with JRE21 (default) and JRE25- - branch: branch_10_0- version: 10.0.0-SNAPSHOT- gradle-jdk: 21+ # branch_9x - Gradle on JDK17, Docker images with JRE17 (default) and JRE21+ - branch: branch_9x+ gradle-jdk: 17dist: full- base-image: eclipse-temurin:21-jre-jammy+ base-image: eclipse-temurin:17-jre-jammytag-suffix: ''- - branch: branch_10_0- version: 10.0.0-SNAPSHOT- gradle-jdk: 21+ - branch: branch_9x+ gradle-jdk: 17dist: slim- base-image: eclipse-temurin:21-jre-jammy+ base-image: eclipse-temurin:17-jre-jammytag-suffix: ''- - branch: branch_10_0- version: 10.0.0-SNAPSHOT- gradle-jdk: 21+ - branch: branch_9x+ gradle-jdk: 17dist: full- base-image: eclipse-temurin:25-jre-jammy- tag-suffix: '-java25'+ base-image: eclipse-temurin:21-jre-jammy+ tag-suffix: '-java21'- # branch_9x - Gradle on JDK17, Docker images with JRE17 (default) and JRE21- - branch: branch_9x- version: 9.11.0-SNAPSHOT+ # branch_9_11 - Gradle on JDK17, Docker images with JRE17 (default) and JRE21+ - branch: branch_9_11gradle-jdk: 17dist: fullbase-image: eclipse-temurin:17-jre-jammytag-suffix: ''- - branch: branch_9x- version: 9.11.0-SNAPSHOT+ - branch: branch_9_11gradle-jdk: 17dist: slimbase-image: eclipse-temurin:17-jre-jammytag-suffix: ''- - branch: branch_9x- version: 9.11.0-SNAPSHOT+ - branch: branch_9_11gradle-jdk: 17dist: fullbase-image: eclipse-temurin:21-jre-jammy@@ -155,20 +144,21 @@ jobs:username: ${{ secrets.DOCKERHUB_USER }}password: ${{ secrets.DOCKERHUB_TOKEN }}- - name: Build Docker tag name- id: tag- run: |- if [ "${{ matrix.dist }}" = "slim" ]; then- echo "tag=${{ matrix.version }}-slim${{ matrix.tag-suffix }}" >> $GITHUB_OUTPUT- else- echo "tag=${{ matrix.version }}${{ matrix.tag-suffix }}" >> $GITHUB_OUTPUT- fi-- name: Test and publish Docker imagerun: |+ TAG_ARGS=""+ if [ -n "${{ matrix.version }}" ]; then+ if [ "${{ matrix.dist }}" = "slim" ]; then+ TAG_ARGS="-Psolr.docker.imageTag=${{ matrix.version }}-slim${{ matrix.tag-suffix }}"+ else+ TAG_ARGS="-Psolr.docker.imageTag=${{ matrix.version }}${{ matrix.tag-suffix }}"+ fi+ elif [ -n "${{ matrix.tag-suffix }}" ]; then+ TAG_ARGS="-Psolr.docker.imageTagSuffix=${{ matrix.tag-suffix }}"+ fi./gradlew testDocker dockerPush \-Psolr.docker.imageRepo=apache/solr-nightly \- -Psolr.docker.imageTag=${{ steps.tag.outputs.tag }} \+ $TAG_ARGS \-Psolr.docker.dist=${{ matrix.dist }} \-Psolr.docker.platform=linux/arm64,linux/amd64 \-Psolr.docker.baseImage=${{ matrix.base-image }}