Fix docker build (#13439)

Author: koppor

.dockerignore

@@ -1,22 +1,27 @@
+.git
 .gitignore
 .dockerignore
 
 Dockerfile
 Dockerfile.*
 .github/
 
+.devcontainer/
+
+*/bin
+*/build
+*/out
+
+docs/
+
+gg.cmd
+gradlew.bat
+
 # no generated files in version control
 src/main/gen/
 src/main/generated/
 src-gen/
 
-src/main/resources/csl-styles
-src/main/resources/csl-locales
-buildres/abbrv.jabref.org
-
-jablib/src/main/resources/csl-styles
-jablib/src/main/resources/csl-locales
-
 .lycheecache
 
 .kotlin

.github/workflows/dockerimages.yml

@@ -3,6 +3,7 @@ name: Docker Images
 on:
   pull_request:
     paths:
+      - '.dockerignore'
       - '.github/workflows/dockerimages.yml'
       - 'Dockerfile.*'
   push:
@@ -51,6 +52,19 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Fetch all history for all tags and branches
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+          show-progress: 'false'
+      - name: Install GitVersion
+        uses: gittools/actions/gitversion/setup@v3.2.1
+        with:
+          versionSpec: "5.x"
+      - name: Run GitVersion
+        id: gitversion
+        uses: gittools/actions/gitversion/execute@v3.2.1
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
@@ -63,3 +77,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: Dockerfile.${{ matrix.component }}
+          build-args: |
+            VERSION=${{ steps.gitversion.outputs.AssemblySemVer }}
+            VERSION_INFO=${{ steps.gitversion.outputs.InformationalVersion }}

Dockerfile.jabkit

@@ -1,16 +1,21 @@
 FROM gradle:jdk24-noble AS build
 
-WORKDIR /app
+LABEL org.opencontainers.image.title="jabkit"
+LABEL org.opencontainers.image.description="JabRef's CLI tool"
 
-COPY . .
+ARG VERSION="100.0.0"
+ARG VERSION_INFO="100.0.0"
+ARG TAG_BUILD="false"
+
+WORKDIR /build
 
-RUN gradle --no-daemon :jabkit:jpackage
+COPY . .
 
-RUN find jabkit/build/distribution
+RUN gradle --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage
 
 RUN mkdir /dist
 
-RUN mv jabkit/build/distribution/jabkit /dist
+RUN mv jabkit/build/packages/*/* /dist
 
 # jpackage needs glibc; alpine does not work
 FROM debian:bookworm-slim AS runtime

Dockerfile.jabsrv

@@ -1,16 +1,21 @@
 FROM gradle:jdk24-noble AS build
 
-WORKDIR /app
+LABEL org.opencontainers.image.title="jabsrv"
+LABEL org.opencontainers.image.description="JabRef's HTTP server"
 
-COPY . .
+ARG VERSION="100.0.0"
+ARG VERSION_INFO="100.0.0"
+ARG TAG_BUILD="false"
+
+WORKDIR /build
 
-RUN gradle --no-daemon :jabsrv-cli:jpackage
+COPY . .
 
-RUN find jabsrv-cli/build/distribution
+RUN gradle --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage
 
 RUN mkdir /dist
 
-RUN mv jabsrv-cli/build/distribution/jabsrv /dist
+RUN mv jabsrv-cli/build/packages/*/* /dist
 
 # jpackage needs glibc; alpine does not work
 FROM debian:bookworm-slim AS runtime