Skip to content

Commit 5ad4eb8

Browse files
authored
Use SNAPSHOT versioning for dev builds to more easily override JAVA_TOOL_OPTIONS. (#28)
1 parent 3185c2b commit 5ad4eb8

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
import com.github.jk1.license.render.InventoryMarkdownReportRenderer
17+
import nebula.plugin.release.git.opinion.Strategies
1718
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
1819

1920
plugins {
@@ -26,6 +27,10 @@ plugins {
2627
id("nebula.release")
2728
}
2829

30+
release {
31+
defaultVersionStrategy = Strategies.getSNAPSHOT()
32+
}
33+
2934
val releaseTask = tasks.named("release")
3035
val postReleaseTask = tasks.named("release")
3136

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1-
FROM amazoncorretto/amazoncorretto:11-alpine-jre
1+
FROM amazoncorretto:11-alpine-jdk
2+
3+
# Copied from https://github.com/corretto/corretto-docker/blob/master/11/jre/alpine/Dockerfile
4+
RUN jlink --endian little --release-info $JAVA_HOME/release \
5+
--add-modules "java.base,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.prefs,\
6+
java.rmi,java.security.sasl,java.xml,jdk.internal.vm.ci,jdk.jfr,jdk.management,jdk.management.jfr,jdk.management.agent,jdk.net,jdk.sctp,jdk.unsupported,\
7+
jdk.naming.rmi,java.compiler,jdk.aot,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,java.se,java.net.http,java.scripting,java.security.jgss,\
8+
java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,\
9+
jdk.dynalink,jdk.httpserver,jdk.jsobject,jdk.localedata,jdk.naming.dns,jdk.scripting.nashorn,jdk.security.auth,jdk.security.jgss,jdk.xml.dom,jdk.zipfs,\
10+
jdk.pack,jdk.scripting.nashorn.shell,jdk.jcmd,jdk.jfr" \
11+
--no-man-pages --no-header-files --strip-debug --output /temp/java-11-amazon-corretto
12+
13+
FROM alpine:3.12
14+
15+
COPY --from=0 /temp/java-11-amazon-corretto /usr/lib/jvm/java-11-amazon-corretto
16+
COPY --from=0 /licenses /licenses
217

318
RUN apk update && apk add libc6-compat ca-certificates && rm -rf /var/cache/apk/*
419

20+
ENV LANG C.UTF-8
21+
ENV JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto
22+
ENV PATH=$PATH:/usr/lib/jvm/java-11-amazon-corretto/bin
23+
524
ENTRYPOINT ["java", "-jar"]

0 commit comments

Comments
 (0)