Skip to content

Fix Docker building (and also build for forks) #15389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koppor merged 2 commits into from
Mar 23, 2026
+34 −13
Merged

Fix Docker building (and also build for forks) #15389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb2cd7
Fix Docker building (and also build for forks)
koppor Mar 23, 2026
090a26f
Fix meta data
koppor Mar 23, 2026
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
5 changes: 2 additions & 3 deletions .github/workflows/dockerimages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ permissions:

jobs:
build:
if: github.repository == 'JabRef/jabref'
strategy:
max-parallel: 1
matrix:
Expand All @@ -34,14 +33,14 @@ jobs:
uses: docker/metadata-action@v6
with:
images: |
ghcr.io/JabRef/${{ matrix.component }}
ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}
tags: |
type=schedule,pattern={{date 'YYYY-MM-DD'}}
type=ref,event=tag
type=edge,branch=main
type=ref,event=pr
labels: |
org.opencontainers.image.source=https://github.com/JabRef/jabref
org.opencontainers.image.source=https://github.com/${{ github.repository }}
org.opencontainers.image.title=${{ matrix.component }}
org.opencontainers.image.description=${{ matrix.component == 'jabkit' && 'JabRef''s CLI tool' || 'JabRef''s HTTP server' }}
- name: Login to GitHub Container Registry
Expand Down
21 changes: 16 additions & 5 deletions Dockerfile.jabkit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM maven:3.9.12-amazoncorretto-25-debian AS build
FROM maven:3.9.14-amazoncorretto-25-debian AS build

# Is not debian-based
# FROM amazoncorretto:25-jdk AS build
# FROM amazoncorretto:26-jdk AS build
Copy link
Copy Markdown
Contributor

@qodo-free-for-open-source-projects qodo-free-for-open-source-projects bot Mar 23, 2026

Choose a reason for hiding this comment

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

Action required

1. Amazoncorretto commented from line 📘 Rule violation ⚙ Maintainability

A commented-out FROM ... AS build line is kept in a modified section of the Dockerfile, which is
considered commented-out code. This increases maintenance noise and violates the requirement to
remove commented-out code in touched areas.
Agent Prompt 
## Issue description
A commented-out Docker instruction (`# FROM ...`) remains in a modified part of the Dockerfile.

## Issue Context
The project compliance rules require removing commented-out code in touched sections.

## Fix Focus Areas
- Dockerfile.jabkit[4-4]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


ARG VERSION="100.0.0"
ARG VERSION_INFO="100.0.0"
Expand Down Expand Up @@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
COPY jabsrv/build.gradle.kts jabsrv/
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
COPY test-support test-support
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java

COPY versions versions

# Cache gradle and build-logic
RUN ./gradlew --no-daemon :build-logic:jar

COPY . .

RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage && \
mkdir /dist && \
mv jabkit/build/packages/*/* /dist
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage

RUN mkdir /dist

RUN mv jabkit/build/packages/*/* /dist


# jpackage needs glibc; alpine does not work
Expand Down
21 changes: 16 additions & 5 deletions Dockerfile.jabsrv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM maven:3.9.12-amazoncorretto-25-debian AS build
FROM maven:3.9.14-amazoncorretto-25-debian AS build

# Is not debian-based
# FROM amazoncorretto:25-jdk AS build
# FROM amazoncorretto:26-jdk AS build

ARG VERSION="100.0.0"
ARG VERSION_INFO="100.0.0"
Expand Down Expand Up @@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
COPY jabsrv/build.gradle.kts jabsrv/
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
COPY test-support test-support
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java

COPY versions versions

# Cache gradle and build-logic
RUN ./gradlew --no-daemon :build-logic:jar

COPY . .

RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage && \
mkdir /dist && \
mv jabsrv-cli/build/packages/*/* /dist
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage

RUN mkdir /dist

RUN mv jabsrv-cli/build/packages/*/* /dist


# jpackage needs glibc; alpine does not work
Expand Down
Loading