Community Catalog PR 332 diffs

docker-compose.diff

diff --git a/0/docker-compose.yml b/1/docker-compose.yml
index b3420a2..6e17080 100644
--- a/0/docker-compose.yml
+++ b/1/docker-compose.yml
@@ -1,18 +1,35 @@
 Minecraft:
   environment:
-    EULA: ${EULA}
-    VERSION: ${VERSION}
-    DIFFICULTY: ${DIFFICULTY}
-    MODE: ${MODE}
-    PVP: ${PVP}
-    WHITELIST: ${WHITELIST}
-    OPS: ${OPS}
-    MOTD: ${MOTD}
-    SEED: ${SEED}
-    WORLD: ${WORLD}
+    - EULA
+    - VERSION
+    - DIFFICULTY
+    - MODE
+    - LEVEL_TYPE
+    - GENERATOR_SETTINGS
+    - PVP
+    - WHITELIST
+    - OPS
+    - MOTD
+    - SEED
+    - WORLD
   tty: true
   image: itzg/minecraft-server
   stdin_open: true
+  labels:
+    io.rancher.sidekicks: MinecraftData
+  volumes_from:
+    - MinecraftData
+
+MinecraftData:
+  image: busybox
+  labels:
+    io.rancher.container.start_once: 'true'
+  net: none
+  entrypoint: /bin/true
+  volumes:
+    - ${DATA_VOLUME}/data
+  volume_driver: ${VOLUME_DRIVER}
+
 MinecraftLB:
   ports:
   - ${PORT}:25565/tcp
@@ -21,4 +38,3 @@ MinecraftLB:
   links:
   - Minecraft:Minecraft
   stdin_open: true
-

rancher-compose.diff

diff --git a/0/rancher-compose.yml b/1/rancher-compose.yml
index 3511458..a9aac27 100644
--- a/0/rancher-compose.yml
+++ b/1/rancher-compose.yml
@@ -1,9 +1,9 @@
 .catalog:
   name: "Minecraft"
-  version: "v1.8"
+  version: "v1.11"
   description: "Minecraft server"
   uuid: minecraft-0
-  questions: 
+  questions:
     - variable: "EULA"
       label: "Accept EULA"
       description: "Select TRUE to accept the Minecraft EULA"
@@ -25,13 +25,13 @@
       type: "int"
     - variable: "VERSION"
       label: "Minecraft Version"
-      description: "Select the version of Minecraft server to run.  Default is the latest available"
-      required: false
+      description: "Select the version of Minecraft server to run. Default is the latest available."
       type: "enum"
       default: LATEST
       options:
         - LATEST
         - SNAPSHOT
+        - 1.11
         - 1.8.9
         - 1.7.10
         - 1.6.4
@@ -57,6 +57,21 @@
         - creative
         - adventure
         - spectator
+    - variable: "LEVEL_TYPE"
+      label: "Level Type"
+      description: ""
+      default: "DEFAULT"
+      type: "enum"
+      options:
+        - DEFAULT
+        - FLAT
+        - LARGEBIOMES
+        - AMPLIFIED
+        - CUSTOMIZED
+    - variable: "GENERATOR_SETTINGS"
+      label: "Generator Settings"
+      description: "Custom generator settings. Only used for level types FLAT and CUSTOMIZED."
+      type: "string"
     - variable: "PVP"
       label: "PvP mode"
       description: "Check here to enable PvP mode.  Default is no PvP."
@@ -85,8 +100,29 @@
       label: "World URL"
       description: "URL to download zipped world directory"
       type: "string"
+    - variable: "DATA_VOLUME"
+      label: "Data Volume"
+      description: "Host directory or Convoy volume name, followed by a colon (':'). E.g.: '/mnt/data:'; 'minecraft-data:'"
+      type: "string"
+    - variable: "VOLUME_DRIVER"
+      description: "Name of Convoy Storage Pool, if one is used."
+      type: "string"
 Minecraft:
   scale: ${SCALE}
+  health_check:
+    port: 25565
+    interval: 2000
+    initializing_timeout: 30000
+    unhealthy_threshold: 3
+    strategy: recreate
+    response_timeout: 2000
+    healthy_threshold: 2
 MinecraftLB:
   load_balancer_config: {}
-
+  health_check:
+    port: 42
+    interval: 2000
+    unhealthy_threshold: 3
+    strategy: recreate
+    response_timeout: 2000
+    healthy_threshold: 2