Various updates and fixes

templates/EclipseChe-Single/0/docker-compose.yml

@@ -6,17 +6,32 @@ services:
       - 1.1.1.1
       - 1.0.0.1
     environment:
-      - CHE_HOST=${HOST_IP}
+      CHE_HOST: ${HOST_IP}
-      - CHE_PORT=${CHE_PORT}
+      CHE_PORT: ${CHE_PORT}
+      CHE_IN_VM: true
     labels:
       io.rancher.container.pull_image: always
-      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
+      {{- if (.Values.HOST_LABEL)}}
-      io.rancher.container.hostname_override: eclipse-che
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
     ports:
       - "${CHE_PORT}:8080"
-    privileged: true
     restart: on-failure
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${STORAGE_BASE_DIR}${DATA_DIR}:/data
+      - Data:/data
-      - ${STORAGE_BASE_DIR}${REPO_DIR}:/repo
+      - Repo:/repo
+
+volumes:
+  Data:
+    driver: rancher-nfs
+    driver_opts:
+      host: 10.0.10.21
+      export: /RancherCattleData/${DATA_DIR}/Data
+      onRemove: retain
+  Repo:
+    driver: rancher-nfs
+    driver_opts:
+      host: 10.0.10.21
+      export: /RancherCattleData/${DATA_DIR}/Repo
+      onRemove: retain

templates/EclipseChe-Single/0/rancher-compose.yml

@@ -8,12 +8,12 @@ catalog:
   # upgrade_from:
   questions:
 
-    - variable: "LABEL_KEY_VALUE"
+    - variable: HOST_LABEL
       label: "Host Label Key/Value Pair"
       description: |
-        The Label Key/Value pair on the host which Eclipse Che should be deployed
+        The Label Key/Value pair on the host which containers should be deployed
       default: "host.id=0000"
-      required: true
+      required: false
       type: string
 
     - variable: "HOST_IP"
@@ -32,26 +32,10 @@ catalog:
       required: true
       type: string
 
-    - variable: "STORAGE_BASE_DIR"
+    - variable: DATA_DIR
-      label: "Base Storage Directory"
-      description: |
-        The base path of where persistent storage should be kept at.
-      default: "/RancherStorage/EclipseChe-SingleUser"
-      required: true
-      type: string
-
-    - variable: "DATA_DIR"
       label: "Data Directory"
       description: |
-        The directory Eclipse Che should use for it's persistent data storage
+        The directory to store persistent data
-      default: "/Data"
+      default: "Personal/EclipseChe-Single"
-      required: true
-      type: string
-
-    - variable: "REPO_DIR"
-      label: "Persistent Storage Volume"
-      description: |
-        The directory Eclipse Che should use for it's persistent repo storage
-      default: "/Repo"
       required: true
       type: string