Skip to content

Commit b656e1e

Browse files
unlairunlair
authored
Fix Docker builds on Debian (Stirling-Tools#5936)
1 parent 7f9bbeb commit b656e1e

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎docker/Dockerfile.unified‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ COPY app/core/build.gradle core/.
2525
COPY app/common/build.gradle common/.
2626
COPY app/proprietary/build.gradle proprietary/.
2727

28-
ENV JAVA_TOOL_OPTIONS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
29-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
30-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
31-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
32-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
28+
ENV JAVA_TOOL_OPTIONS="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
29+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
30+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
31+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
32+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
3333

3434
RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
3535

‎docker/Dockerfile.unified-lite‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ COPY app/core/build.gradle core/.
2525
COPY app/common/build.gradle common/.
2626
COPY app/proprietary/build.gradle proprietary/.
2727

28-
ENV JAVA_TOOL_OPTIONS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
29-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
30-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
31-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
32-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
28+
ENV JAVA_TOOL_OPTIONS="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
29+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
30+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
31+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
32+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
3333

3434
RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
3535

‎docker/embedded/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
271271
&& rm -rf /var/lib/apt/lists/*
272272

273273
# JDK 25+: --add-exports is no longer accepted via JAVA_TOOL_OPTIONS; use JDK_JAVA_OPTIONS instead
274-
ENV JDK_JAVA_OPTIONS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
275-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
276-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
277-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
278-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
274+
ENV JDK_JAVA_OPTIONS="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
275+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
276+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
277+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
278+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
279279

280280
WORKDIR /app
281281

‎docker/embedded/Dockerfile.fat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
194194
&& rm -rf /var/lib/apt/lists/*
195195

196196
# JDK 25+: --add-exports is no longer accepted via JAVA_TOOL_OPTIONS; use JDK_JAVA_OPTIONS instead
197-
ENV JDK_JAVA_OPTIONS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
198-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
199-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
200-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
201-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
197+
ENV JDK_JAVA_OPTIONS="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
198+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
199+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
200+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
201+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
202202

203203
WORKDIR /app
204204

‎docker/embedded/Dockerfile.ultra-lite‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ COPY app/common/build.gradle app/common/
2424
COPY app/proprietary/build.gradle app/proprietary/
2525

2626
# JDK 25+: --add-exports is no longer accepted via JAVA_TOOL_OPTIONS; use JDK_JAVA_OPTIONS instead
27-
ENV JDK_JAVA_OPTIONS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
28-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
29-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
30-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
31-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
27+
ENV JDK_JAVA_OPTIONS="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
28+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
29+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
30+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
31+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
3232

3333
RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
3434
./gradlew dependencies --no-daemon || true

0 commit comments

Comments
 (0)