|
1 | | -FROM maven:3.9.12-amazoncorretto-25-debian AS build |
| 1 | +FROM maven:3.9.14-amazoncorretto-25-debian AS build |
2 | 2 |
|
3 | 3 | # Is not debian-based |
4 | | -# FROM amazoncorretto:25-jdk AS build |
| 4 | +# FROM amazoncorretto:26-jdk AS build |
5 | 5 |
|
6 | 6 | ARG VERSION="100.0.0" |
7 | 7 | ARG VERSION_INFO="100.0.0" |
@@ -32,16 +32,27 @@ COPY jabls-cli/build.gradle.kts jabls-cli/ |
32 | 32 | COPY jabsrv/build.gradle.kts jabsrv/ |
33 | 33 | COPY jabsrv-cli/build.gradle.kts jabsrv-cli/ |
34 | 34 | 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 | + |
35 | 44 | COPY versions versions |
36 | 45 |
|
37 | 46 | # Cache gradle and build-logic |
38 | 47 | RUN ./gradlew --no-daemon :build-logic:jar |
39 | 48 |
|
40 | 49 | COPY . . |
41 | 50 |
|
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 |
45 | 56 |
|
46 | 57 |
|
47 | 58 | # jpackage needs glibc; alpine does not work |
|
0 commit comments