Merge 90ee1a2e3e into f659c56f18

.readthedocs.yaml

@@ -1,5 +1,4 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
 version: 2
 
 build:

docker-compose-mkdocs.yml

@@ -4,8 +4,6 @@
 #
 # and then access http://localhost:8000
 
-version: "3.8"
-
 services:
   mkdocs:
     build:

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

docs/configuration/interpolating.md

@@ -66,7 +66,6 @@ database:
 This is how your `docker-compose.yml` file could look like:
 
 ```yml
-version: "3.8"
 # Other docker-compose examples in /examples
 
 services:

docs/data-directory.md

@@ -31,7 +31,6 @@ When attached in this way you can stop the server, edit the configuration under
 With Docker Compose, setting up a host attached directory is even easier since relative paths can be configured. For example, with the following `docker-compose.yml` Docker will automatically create/attach the relative directory `minecraft-data` to the container.
 
 ``` yaml title="docker-compose.yml"
-version: "3"
 
 services:
   mc:

docs/index.md

@@ -39,7 +39,6 @@ By default, the container will download the latest version of the "vanilla" [Min
 4. Done! Point your client at your host's name/IP address and port 25565.
 
 ```yaml
-version: "3.8"
 
 services:
   mc:

docs/misc/examples.md

@@ -7,7 +7,6 @@ Various examples are [maintained in the repository](https://github.com/itzg/dock
 Using the [GeyserMC plugin](https://geysermc.org/) with a Paper server (or similar) "enables clients from Minecraft Bedrock Edition to join your Minecraft Java server". The example also includes [Floodgate](https://wiki.geysermc.org/floodgate/) which "allows Xbox Live authenticated Bedrock users to join without a Java Edition account". 
 
 ```yaml
-version: "3.8"
 
 services:
   mc:
@@ -33,7 +32,6 @@ Monitors network traffic to the Minecraft containers. If there is traffic, the c
 By using [Lazytainer](https://github.com/vmorganp/Lazytainer) with the [docker-minecraft-server](https://github.com/itzg/docker-minecraft-server) a somehow similar behaviour to [Lazymc](https://github.com/timvisee/lazymc) can be archived.
 
 ```yaml
-version: "3"
 services:
   lazytainer:
     image: ghcr.io/vmorganp/lazytainer:master

docs/requirements.txt

@@ -1,7 +1,7 @@
-mkdocs-material == 9.5.19
+mkdocs-material == 9.5.21
 mkdocs-autorefs == 1.0.1
-mkdocstrings == 0.25.0
+mkdocstrings == 0.25.1
 mkdocs-literate-nav == 0.6.1
 mdx-gh-links == 0.4
 mkdocs-click == 0.8.1
-mkdocs-static-i18n == 1.2.2
+mkdocs-static-i18n == 1.2.3

examples/atm8/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/atm9/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/auto-cf/using-excludes/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server:java8-multiarch

examples/bettermc/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/curseforge-files/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-autopause.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   minecraft:
     image: itzg/minecraft-server

examples/docker-compose-autostop.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   minecraft:
     image: itzg/minecraft-server

examples/docker-compose-big.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   minecraft:
     ports:

examples/docker-compose-curseforge-atm7.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 ####################################################################
 #                         CURSEFORGE                               #
 #                                                                  #

examples/docker-compose-curseforge.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
     image: itzg/minecraft-server:${IMAGE_TAG:-java8}

examples/docker-compose-fabric.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-forge-bettermcplus

@@ -1,5 +1,3 @@
-version: '3.8'
-
 ####################################################################
 #                       FORGE_GENERIC_PACK                         #
 #                                                                  #

examples/docker-compose-forge.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-ftba.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     # FTBA support is only available in non-Alpine images

examples/docker-compose-generic-pack-tnp5.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 ####################################################################
 #                         FORGE GENERIC_PACK                       #
 #                                                                  #

examples/docker-compose-generic-pack.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
     image: itzg/minecraft-server:${IMAGE_TAG:-latest}

examples/docker-compose-magma.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server:java8

examples/docker-compose-modrinth.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-mods-mount.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   minecraft:
     image: itzg/minecraft-server

examples/docker-compose-mohist.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-ngrok.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-paper.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-proxied.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
 #    build: .

examples/docker-compose-rconcmd.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   minecraft:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

examples/docker-compose-rlcraft.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
     image: itzg/minecraft-server:java8

examples/docker-compose-simple.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-spiget.yml

@@ -4,8 +4,6 @@
 # feature https://docker-minecraft-server.readthedocs.io/en/latest/mods-and-plugins/spiget/
 # which uses the Spiget API at https://spiget.org/
 
-version: "3"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/docker-compose-spongeforge.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 # Forge with Sponge API support. THIS REQUIRES DOWNLOADING SPONGEFORGE.
 # Place the SpongeForge jar file in /data/mods. Other Forge mods go here as well.
 # Place Sponge mods in /data/mods/plugins. Yes, this is a directory inside the Forge mod directory. Do NOT use /data/plugins.

examples/docker-compose-tailscale.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   tailscale-client:
     image: tailscale/tailscale:latest

examples/docker-compose-world-download.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/geyser/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/lazytainer/docker_compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   lazytainer:
     image: ghcr.io/vmorganp/lazytainer:master

examples/modrinth-modpack/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/modrinth-paper/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/mods-file/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
     image: itzg/minecraft-server

examples/multi-project/dbs/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mariadb:
     image: mariadb:10

examples/multi-project/servers/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   proxy:
     image: itzg/bungeecord

examples/one-block-modded/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/paper-build-plugins/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   mc:
     build: .

examples/pixelmon/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server:java8-multiarch

examples/quilt/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/rlcraft/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server:java8-multiarch

examples/valhelsia2/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mc:
     image: itzg/minecraft-server:java8-multiarch

examples/valhesia5/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

examples/vanilla-tweaks/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
   vanillatweaks_file:
     restart: "no"

examples/vault-hunters-1-18-2/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mc:
     image: itzg/minecraft-server

scripts/start-setupRbac

@@ -77,13 +77,20 @@ if [[ -v WHITELIST_FILE ]]; then
 fi
 if [[ -v WHITELIST ]]; then
   args=()
-  if isTrue "${APPEND_WHITELIST:-false}" || isFalse "${OVERRIDE_WHITELIST:-true}"; then
-    args+=(--append-only)
-  fi
   existing="$EXISTING_WHITELIST_FILE"
+  # Working with an OPS list, so normalize the value to a "non-file" mode
   if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then
     existing=MERGE
   fi
+  # legacy option
+  if [[ -v APPEND_WHITELIST ]] && isTrue "${APPEND_WHITELIST}"; then
+    existing=MERGE
+  fi
+  # legacy option
+  if [[ -v OVERRIDE_WHITELIST ]] && isFalse "${OVERRIDE_WHITELIST}"; then
+    existing=SKIP
+  fi
+
   # shellcheck disable=SC2086
   mc-image-helper manage-users \
     "${sharedArgs[@]}" "${args[@]}" \

tests/fulltests/multi-part-motd/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   monitor:
     depends_on:

tests/fulltests/vanilla-latest/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   monitor:
     depends_on:

tests/setuponlytests/auto_curseforge/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/cf_files/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/conflicting_world_for_spigot_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/curseforge/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server:java8-multiarch}

tests/setuponlytests/defaults/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/generic-packs-prefix/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/generic-packs/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     image: nginx

tests/setuponlytests/icon-file-exact/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/icon-file-scale/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/icon-gif-multiframe/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     image: nginx

tests/setuponlytests/icon-png-atscale/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     image: nginx

tests/setuponlytests/icon-png-scale/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     image: nginx

tests/setuponlytests/modrinth/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/mounts-custom/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}

tests/setuponlytests/ops_from_scratch/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/packwiz/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     image: nginx

tests/setuponlytests/pufferfish/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/quilt/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/spiget/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/spigot_world_for_spigot_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/spigot_world_for_vanilla_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/spongevanilla_version_compare/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/vanilla_world_for_spigot_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/vanilla_world_for_vanilla_server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/vanillatweaks_file/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/vanillatweaks_sharecode/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/whitelist_from_scratch/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/world_from_tar/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/world_from_tarbz2/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/world_from_targz/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/world_from_tarzst/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"

tests/setuponlytests/world_from_zip/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mc:
     restart: "no"