From 24918ac0f644fb13ad40f7828b39222b3b44c117 Mon Sep 17 00:00:00 2001 From: WilliamMiceli <9000802+WilliamMiceli@users.noreply.github.com> Date: Thu, 28 Jun 2018 06:49:24 -0400 Subject: [PATCH] Format conformity updates --- templates/BInd9/0/rancher-compose.yml | 12 ++++++++---- templates/EclipseChe-Multi/0/rancher-compose.yml | 9 +++++++++ templates/EclipseChe-Single/0/rancher-compose.yml | 15 ++++++++++++--- templates/Ghost/0/rancher-compose.yml | 12 ++++++++---- templates/Grafana/0/rancher-compose.yml | 11 ++++++++--- templates/Guacamole/0/rancher-compose.yml | 12 +++++++----- templates/Jenkins-CI/0/rancher-compose.yml | 9 +++++++-- templates/LetsEncrypt/0/rancher-compose.yml | 11 +++++++---- templates/Mumble/0/rancher-compose.yml | 12 +++++++++--- templates/Netdata/0/rancher-compose.yml | 11 ++++++++--- templates/NextCloud/0/rancher-compose.yml | 8 ++++++-- templates/OpenHAB/0/rancher-compose.yml | 9 ++++++--- templates/OpenProject/0/rancher-compose.yml | 9 ++++++--- templates/RocketChat/0/rancher-compose.yml | 12 ++++++++---- templates/SnipeIT/0/rancher-compose.yml | 9 +++++++++ templates/Thingsboard/0/rancher-compose.yml | 9 ++++++--- templates/Traefik/0/rancher-compose.yml | 10 +++++----- templates/Turtl/0/rancher-compose.yml | 11 ++++++++--- templates/gitlab-ce/0/rancher-compose.yml | 9 +++++++++ templates/minecraft/0/rancher-compose.yml | 9 +++++++++ templates/roundcube/0/rancher-compose.yml | 9 +++++++++ 21 files changed, 164 insertions(+), 54 deletions(-) diff --git a/templates/BInd9/0/rancher-compose.yml b/templates/BInd9/0/rancher-compose.yml index f1d0326..495414c 100644 --- a/templates/BInd9/0/rancher-compose.yml +++ b/templates/BInd9/0/rancher-compose.yml @@ -1,7 +1,11 @@ -.catalog: - name: "Bind9 DNS" - version: "v1.0.0-rancher1" - description: "Domain Name Server powered by Bind9" +version: '2' +catalog: + name: Bind9 + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: "BIND9_ROOTDOMAIN" diff --git a/templates/EclipseChe-Multi/0/rancher-compose.yml b/templates/EclipseChe-Multi/0/rancher-compose.yml index e69de29..0f38cea 100644 --- a/templates/EclipseChe-Multi/0/rancher-compose.yml +++ b/templates/EclipseChe-Multi/0/rancher-compose.yml @@ -0,0 +1,9 @@ +version: '2' +catalog: + name: Eclipse Che (Multi-User) + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + # questions: \ No newline at end of file diff --git a/templates/EclipseChe-Single/0/rancher-compose.yml b/templates/EclipseChe-Single/0/rancher-compose.yml index 685e09f..b7909cb 100644 --- a/templates/EclipseChe-Single/0/rancher-compose.yml +++ b/templates/EclipseChe-Single/0/rancher-compose.yml @@ -1,9 +1,13 @@ version: '2' catalog: - name: "Eclipse Che (Single-User)" - version: "latest" - description: A new awesome web IDE + name: Eclipse Che (Single-User) + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: + - variable: "LABEL_KEY_VALUE" label: "Host Label Key/Value Pair" description: | @@ -11,6 +15,7 @@ catalog: default: "host.id=0000" required: true type: string + - variable: "HOST_IP" label: "Host IP Address" description: | @@ -18,6 +23,7 @@ catalog: default: "0.0.0.0" required: true type: string + - variable: "CHE_PORT" label: "Port Number" description: | @@ -25,6 +31,7 @@ catalog: default: "8080" required: true type: string + - variable: "STORAGE_BASE_DIR" label: "Base Storage Directory" description: | @@ -32,6 +39,7 @@ catalog: default: "/RancherStorage/EclipseChe-SingleUser" required: true type: string + - variable: "DATA_DIR" label: "Data Directory" description: | @@ -39,6 +47,7 @@ catalog: default: "/Data" required: true type: string + - variable: "REPO_DIR" label: "Persistent Storage Volume" description: | diff --git a/templates/Ghost/0/rancher-compose.yml b/templates/Ghost/0/rancher-compose.yml index 0a4ef55..6599bb6 100644 --- a/templates/Ghost/0/rancher-compose.yml +++ b/templates/Ghost/0/rancher-compose.yml @@ -1,7 +1,11 @@ -.catalog: - name: "Ghost" - version: "v0.1-educaas" - description: "Blog powered by Ghost. Requires no database" +version: '2' +catalog: + name: Ghost + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: uuid: ghost-0 questions: diff --git a/templates/Grafana/0/rancher-compose.yml b/templates/Grafana/0/rancher-compose.yml index 0bd91a8..12b0f35 100644 --- a/templates/Grafana/0/rancher-compose.yml +++ b/templates/Grafana/0/rancher-compose.yml @@ -1,6 +1,11 @@ -.catalog: - name: "Grafana" - version: "4.2.0-rancher2" +version: '2' +catalog: + name: Grafana + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: http_port diff --git a/templates/Guacamole/0/rancher-compose.yml b/templates/Guacamole/0/rancher-compose.yml index 3f662bb..32c9fd9 100644 --- a/templates/Guacamole/0/rancher-compose.yml +++ b/templates/Guacamole/0/rancher-compose.yml @@ -1,9 +1,11 @@ version: '2' -.catalog: - name: "apache-guacamole" - version: "0.1-rancher1" - description: " Apache Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH." - minimum_rancher_version: v0.46.0 +catalog: + name: Guacamole + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: "guacamole_db" diff --git a/templates/Jenkins-CI/0/rancher-compose.yml b/templates/Jenkins-CI/0/rancher-compose.yml index be63407..40b6f14 100644 --- a/templates/Jenkins-CI/0/rancher-compose.yml +++ b/templates/Jenkins-CI/0/rancher-compose.yml @@ -1,6 +1,11 @@ -.catalog: +version: '2' +catalog: name: Jenkins - version: 2.92-rancher1 + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: "PORT" diff --git a/templates/LetsEncrypt/0/rancher-compose.yml b/templates/LetsEncrypt/0/rancher-compose.yml index 6eae99a..4e62090 100644 --- a/templates/LetsEncrypt/0/rancher-compose.yml +++ b/templates/LetsEncrypt/0/rancher-compose.yml @@ -1,8 +1,11 @@ -.catalog: +version: '2' +catalog: name: Let's Encrypt - version: 0.5.0 - description: Trusted SSL certificates at zero cost - minimum_rancher_version: v1.5.0 + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: EULA diff --git a/templates/Mumble/0/rancher-compose.yml b/templates/Mumble/0/rancher-compose.yml index 9baeba4..535c31e 100644 --- a/templates/Mumble/0/rancher-compose.yml +++ b/templates/Mumble/0/rancher-compose.yml @@ -1,7 +1,13 @@ -.catalog: - name: mumble - version: v1.2.17 +version: '2' +catalog: + name: Mumble + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: uuid: mumble-0 + # questions: mumble: scale: 1 \ No newline at end of file diff --git a/templates/Netdata/0/rancher-compose.yml b/templates/Netdata/0/rancher-compose.yml index fdd0a91..4496ae5 100644 --- a/templates/Netdata/0/rancher-compose.yml +++ b/templates/Netdata/0/rancher-compose.yml @@ -1,6 +1,11 @@ -.catalog: - name: netdata - version: v1.8.0 +version: '2' +catalog: + name: Netdata + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: NETDATA_PORT diff --git a/templates/NextCloud/0/rancher-compose.yml b/templates/NextCloud/0/rancher-compose.yml index d5b5046..82e80c4 100644 --- a/templates/NextCloud/0/rancher-compose.yml +++ b/templates/NextCloud/0/rancher-compose.yml @@ -1,7 +1,11 @@ version: '2' catalog: - name: nextcloud - version: 0.0.1 + name: NextCloud + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: NEXTCLOUD_PORT diff --git a/templates/OpenHAB/0/rancher-compose.yml b/templates/OpenHAB/0/rancher-compose.yml index a5c1646..bdd48ec 100644 --- a/templates/OpenHAB/0/rancher-compose.yml +++ b/templates/OpenHAB/0/rancher-compose.yml @@ -1,8 +1,11 @@ version: '2' catalog: - name: "openHAB" - version: "2.4.0-SNAPSHOT" - description: "An open source, technology agnostic home automation platform" + name: OpenHAB + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: "IMAGE_ARCHITECTURE" diff --git a/templates/OpenProject/0/rancher-compose.yml b/templates/OpenProject/0/rancher-compose.yml index 9c04755..b6ede9a 100644 --- a/templates/OpenProject/0/rancher-compose.yml +++ b/templates/OpenProject/0/rancher-compose.yml @@ -1,8 +1,11 @@ version: '2' catalog: - name: openproject - version: 0.0.1 - description: Project planning and scheduling + name: OpenProject + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: OPENPROJECT_PORT diff --git a/templates/RocketChat/0/rancher-compose.yml b/templates/RocketChat/0/rancher-compose.yml index 509ff3b..44d65d9 100644 --- a/templates/RocketChat/0/rancher-compose.yml +++ b/templates/RocketChat/0/rancher-compose.yml @@ -1,7 +1,11 @@ -.catalog: - name: "RocketChat" - version: "v0.1-educaas" - description: "Have your own Slack like online chat, built with Meteor." +version: '2' +catalog: + name: RocketChat + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: uuid: rocketchat-0 questions: diff --git a/templates/SnipeIT/0/rancher-compose.yml b/templates/SnipeIT/0/rancher-compose.yml index e69de29..9e2e78b 100644 --- a/templates/SnipeIT/0/rancher-compose.yml +++ b/templates/SnipeIT/0/rancher-compose.yml @@ -0,0 +1,9 @@ +version: '2' +catalog: + name: SnipeIT + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: \ No newline at end of file diff --git a/templates/Thingsboard/0/rancher-compose.yml b/templates/Thingsboard/0/rancher-compose.yml index b6a2e51..d6c5c24 100644 --- a/templates/Thingsboard/0/rancher-compose.yml +++ b/templates/Thingsboard/0/rancher-compose.yml @@ -1,8 +1,11 @@ version: '2' catalog: - name: "Thingsboard" - version: "v0.1" - description: "An open source IoT platform" + name: Thingsboard + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: uuid: Thingsboard-1 questions: diff --git a/templates/Traefik/0/rancher-compose.yml b/templates/Traefik/0/rancher-compose.yml index 70dffe3..ee897c9 100644 --- a/templates/Traefik/0/rancher-compose.yml +++ b/templates/Traefik/0/rancher-compose.yml @@ -1,11 +1,11 @@ version: '2' catalog: name: traefik - version: v1.6.4-rancher1 - description: | - Traefik load balancer. - minimum_rancher_version: v0.59.0 - maintainer: "Raul Sanchez " + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: uuid: traefik-0 questions: diff --git a/templates/Turtl/0/rancher-compose.yml b/templates/Turtl/0/rancher-compose.yml index 85d16d3..5bc83d3 100644 --- a/templates/Turtl/0/rancher-compose.yml +++ b/templates/Turtl/0/rancher-compose.yml @@ -1,6 +1,11 @@ -.catalog: - name: "turtl" - version: 1.0.1 +version: '2' +catalog: + name: Turtl + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: questions: - variable: "DISPLAY_ERRORS" diff --git a/templates/gitlab-ce/0/rancher-compose.yml b/templates/gitlab-ce/0/rancher-compose.yml index e69de29..ef852fe 100644 --- a/templates/gitlab-ce/0/rancher-compose.yml +++ b/templates/gitlab-ce/0/rancher-compose.yml @@ -0,0 +1,9 @@ +version: '2' +catalog: + name: Gitlab-CE + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + # questions: \ No newline at end of file diff --git a/templates/minecraft/0/rancher-compose.yml b/templates/minecraft/0/rancher-compose.yml index e69de29..59371c5 100644 --- a/templates/minecraft/0/rancher-compose.yml +++ b/templates/minecraft/0/rancher-compose.yml @@ -0,0 +1,9 @@ +version: '2' +catalog: + name: Minecraft + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + # questions: \ No newline at end of file diff --git a/templates/roundcube/0/rancher-compose.yml b/templates/roundcube/0/rancher-compose.yml index e69de29..122bdee 100644 --- a/templates/roundcube/0/rancher-compose.yml +++ b/templates/roundcube/0/rancher-compose.yml @@ -0,0 +1,9 @@ +version: '2' +catalog: + name: Roundcube + version: latest + # description: + # minimum_rancher_version: + # maximum_rancher_version: + # upgrade_from: + questions: \ No newline at end of file