Auto-merging via docker-versions-create

Add option for Flare flags (#827 )
Merged latest from master
2026-02-18 07:26:24 +00:00 · 2021-04-11 10:12:35 -05:00 · 2021-04-09 12:25:51 -05:00 · 2021-04-08 19:32:07 -05:00 · 2021-04-01 16:40:48 -05:00 · 2021-04-01 16:27:50 -05:00
4 changed files with 15 additions and 2 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-jre
+FROM adoptopenjdk:11-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

--- a/README.md
+++ b/README.md
@@ -327,6 +327,10 @@ An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of T

 > **NOTE** only Java 8 and 11 are supported

+Extra variables:
+- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
+- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler
+
 ## Running a Purpur server

 A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, Airplane with the goal of providing new and interesting configuration options".
@@ -338,6 +342,7 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity,
 Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
+- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler

 ## Running a Yatopia server

@@ -350,6 +355,7 @@ A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fa
 Extra variables:
 - `RELEASE=stable` : set to `stable` or `latest`
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
+- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler

 ## Running a Magma server

--- a/2
+++ b/2
@@ -19,7 +19,7 @@ fi

 export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar

-if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
    downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar"
    log "Downloading Airplane from $downloadUrl ..."
    curl -fsSL -o "$SERVER" "$downloadUrl"
--- a/7
+++ b/7
@@ -144,6 +144,13 @@ if isTrue "${USE_LARGE_PAGES}"; then
  "
 fi

+if isTrue "${USE_FLARE_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UnlockDiagnosticVMOptions
+  -XX:+DebugNonSafepoints
+  "
+fi
+
 if isTrue "${DEBUG_MEMORY}"; then
  log "Memory usage and availability (in MB)"
  uname -a
Author	SHA1	Message	Date
Geoff Bourne	a3039eea12	Auto-merging via docker-versions-create	2021-04-11 10:12:35 -05:00
Jawa_Juice	70ea32e89d	Add option for Flare flags (#827 )	2021-04-09 12:25:51 -05:00
Geoff Bourne	10a3037ab3	Merged latest from master	2021-04-08 19:32:07 -05:00
Geoff Bourne	6fab527eed	Auto-merging via docker-versions-create	2021-04-01 16:40:48 -05:00
Geoff Bourne	e5948081a7	Added git #819	2021-04-01 16:27:50 -05:00
Geoff Bourne	298bf5fb0a	Merge branch 'master' into multiarch	2021-03-06 16:27:57 -06:00
Geoff Bourne	44769b6001	Shifted PATH-fix earlier in startup	2021-03-06 16:06:43 -06:00
Geoff Bourne	4186cfd91c	Auto-merging via docker-versions-create	2021-02-27 20:56:01 -06:00
Geoff Bourne	89afba7437	Ensure FTBA version.json is readable #784	2021-02-27 17:03:09 -06:00
Geoff Bourne	f397dd71a9	Fix PATH to include java when needed	2021-02-11 14:52:51 -06:00
Geoff Bourne	02e0a47a52	Merge branch master	2021-02-10 14:58:33 -06:00
Geoff Bourne	60809fe5ad	Merge from master CONFLICT (content): Merge conflict in start-configuration	2021-02-10 14:08:21 -06:00
Geoff Bourne	4a8e416fe1	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:22:16 -06:00
Geoff Bourne	ce4efd0b70	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:16:33 -06:00
Geoff Bourne	f856276d71	Upgraded multiarch to Java 11	2021-02-06 15:22:15 -06:00
Geoff Bourne	0300854c46	Merge branch 'master' into multiarch	2021-02-06 15:21:53 -06:00
Geoff Bourne	f06e9f5ede	Merge branch 'master' into multiarch	2021-02-06 14:52:35 -06:00
Geoff Bourne	8d3ca813ed	Auto-merging via docker-versions-create	2021-01-29 21:07:00 -06:00
Geoff Bourne	e97a00e61d	Auto-merging via docker-versions-create	2021-01-12 17:28:11 -06:00