Skip to content

Commit 88c984d

Browse files
authored
Fix Docker building (and also build for forks) (#15389)
* Fix Docker building (and also build for forks) * Fix meta data
1 parent 57552ee commit 88c984d

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

.github/workflows/dockerimages.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ permissions:
2222

2323
jobs:
2424
build:
25-
if: github.repository == 'JabRef/jabref'
2625
strategy:
2726
max-parallel: 1
2827
matrix:
@@ -34,14 +33,14 @@ jobs:
3433
uses: docker/metadata-action@v6
3534
with:
3635
images: |
37-
ghcr.io/JabRef/${{ matrix.component }}
36+
ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}
3837
tags: |
3938
type=schedule,pattern={{date 'YYYY-MM-DD'}}
4039
type=ref,event=tag
4140
type=edge,branch=main
4241
type=ref,event=pr
4342
labels: |
44-
org.opencontainers.image.source=https://github.com/JabRef/jabref
43+
org.opencontainers.image.source=https://github.com/${{ github.repository }}
4544
org.opencontainers.image.title=${{ matrix.component }}
4645
org.opencontainers.image.description=${{ matrix.component == 'jabkit' && 'JabRef''s CLI tool' || 'JabRef''s HTTP server' }}
4746
- name: Login to GitHub Container Registry

Dockerfile.jabkit

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM maven:3.9.12-amazoncorretto-25-debian AS build
1+
FROM maven:3.9.14-amazoncorretto-25-debian AS build
22

33
# Is not debian-based
4-
# FROM amazoncorretto:25-jdk AS build
4+
# FROM amazoncorretto:26-jdk AS build
55

66
ARG VERSION="100.0.0"
77
ARG VERSION_INFO="100.0.0"
@@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
3232
COPY jabsrv/build.gradle.kts jabsrv/
3333
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
3434
COPY test-support test-support
35+
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
36+
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
37+
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
38+
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
39+
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
40+
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
41+
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
42+
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java
43+
3544
COPY versions versions
3645

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

4049
COPY . .
4150

42-
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage && \
43-
mkdir /dist && \
44-
mv jabkit/build/packages/*/* /dist
51+
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabkit:jpackage
52+
53+
RUN mkdir /dist
54+
55+
RUN mv jabkit/build/packages/*/* /dist
4556

4657

4758
# jpackage needs glibc; alpine does not work

Dockerfile.jabsrv

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM maven:3.9.12-amazoncorretto-25-debian AS build
1+
FROM maven:3.9.14-amazoncorretto-25-debian AS build
22

33
# Is not debian-based
4-
# FROM amazoncorretto:25-jdk AS build
4+
# FROM amazoncorretto:26-jdk AS build
55

66
ARG VERSION="100.0.0"
77
ARG VERSION_INFO="100.0.0"
@@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/
3232
COPY jabsrv/build.gradle.kts jabsrv/
3333
COPY jabsrv-cli/build.gradle.kts jabsrv-cli/
3434
COPY test-support test-support
35+
COPY ./jabgui/src/main/java/module-info.java ./jabgui/src/main/java/module-info.java
36+
COPY ./jabkit/src/main/java/module-info.java ./jabkit/src/main/java/module-info.java
37+
COPY ./jablib/src/main/java/module-info.java ./jablib/src/main/java/module-info.java
38+
COPY ./jabls/src/main/java/module-info.java ./jabls/src/main/java/module-info.java
39+
COPY ./jabls-cli/src/main/java/module-info.java ./jabls-cli/src/main/java/module-info.java
40+
COPY ./jabsrv/src/main/java/module-info.java ./jabsrv/src/main/java/module-info.java
41+
COPY ./jabsrv-cli/src/main/java/module-info.java ./jabsrv-cli/src/main/java/module-info.java
42+
COPY ./test-support/src/main/java/module-info.java ./test-support/src/main/java/module-info.java
43+
3544
COPY versions versions
3645

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

4049
COPY . .
4150

42-
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage && \
43-
mkdir /dist && \
44-
mv jabsrv-cli/build/packages/*/* /dist
51+
RUN ./gradlew --no-daemon -PprojVersion="${VERSION}" -PprojVersionInfo="${VERSION_INFO}" -Ptagbuild="${TAG_BUILD}" :jabsrv-cli:jpackage
52+
53+
RUN mkdir /dist
54+
55+
RUN mv jabsrv-cli/build/packages/*/* /dist
4556

4657

4758
# jpackage needs glibc; alpine does not work

0 commit comments

Comments
 (0)