From 855af340f70bdca8cc3d3dabfc1bbbe8b13b299c Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Fri, 9 Sep 2016 12:50:32 -0700 Subject: [PATCH 01/21] Fix branch already exists in drone (#276) --- scripts/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test b/scripts/test index 864fbd7..c40bba3 100755 --- a/scripts/test +++ b/scripts/test @@ -6,7 +6,7 @@ cd $(dirname $0)/.. trap "rm -rf /scratch/*" exit GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [ -n "${DRONE_BRANCH}" ]; then +if [ -n "${DRONE_BRANCH}" ] && [ "${DRONE_BRANCH}" != "${GIT_BRANCH}" ]; then git checkout -b ${DRONE_BRANCH} GIT_BRANCH=${DRONE_BRANCH} fi From a00d89228851e8224c9bfa35ed4aa2715f41fe7d Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Fri, 9 Sep 2016 12:50:52 -0700 Subject: [PATCH 02/21] update secrets bridge (#272) --- templates/secrets-bridge-agents/0/README.md | 4 ++++ templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/README.md | 4 ++++ templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/README.md b/templates/secrets-bridge-agents/0/README.md index 9a34e60..dbd30ec 100644 --- a/templates/secrets-bridge-agents/0/README.md +++ b/templates/secrets-bridge-agents/0/README.md @@ -6,6 +6,10 @@ Only works with Hashicorp Vault server in dev mode currently. --- #### Description: This is the agent component for the Vault secrets bridge with Rancher. This service will be deployed in the environment running applications that need secrets. This service does not have direct access to Vault, it communicates with the Secrets Bridge server. + +#### Setup + +See [setup guide](https://github.com/rancher/secrets-bridge/blob/master/docs/setup.md) #### Pre-reqs: diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 35de23f..25b4b92 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.0.3 + image: rancher/secrets-bridge:v0.1.0 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/README.md b/templates/secrets-bridge-server/0/README.md index 78cc9b5..9882ca5 100644 --- a/templates/secrets-bridge-server/0/README.md +++ b/templates/secrets-bridge-server/0/README.md @@ -8,6 +8,10 @@ Only works with Hashicorp Vault server in dev mode currently. This is the server side component for the Vault Secrets bridge with Rancher. This service should *NOT* be deployed in the same environment as user applications. It will have access to Vault, and compromising it will give the person access to *ALL* secrets available in that environment. It should instead be run in an environment reserved for the team operating Rancher. The reason this uses a temporary Cubbyhole token to start the service is that ENV variables do show up in the Rancher API and Docker inspect commands. That said, if this service fails, the issuing token will expire and all app tokens will also expire. + +#### Setup + +See [setup guide](https://github.com/rancher/secrets-bridge/blob/master/docs/setup.md) #### Pre-reqs: diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 2b6b70f..c84983d 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.0.3 + image: rancher/secrets-bridge:v0.1.0 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From 1875827ce01a27db164e74d1fca5fdb114126dd8 Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Mon, 12 Sep 2016 21:06:47 -0700 Subject: [PATCH 03/21] Fixes versions in templates (#275) --- swarm-templates/wordpress/0/rancher-compose.yml | 2 +- swarm-templates/wordpress/config.yml | 2 +- templates/alfresco/0/rancher-compose.yml | 2 +- templates/alfresco/config.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swarm-templates/wordpress/0/rancher-compose.yml b/swarm-templates/wordpress/0/rancher-compose.yml index 3ed1fba..fda81ae 100644 --- a/swarm-templates/wordpress/0/rancher-compose.yml +++ b/swarm-templates/wordpress/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Wordpress" - version: latest-rancher1 + version: 1.0.0-latest-rancher1 description: "Blog tool, publishing platform and CMS" minimum_rancher_version: v1.0.0-rc2 questions: diff --git a/swarm-templates/wordpress/config.yml b/swarm-templates/wordpress/config.yml index 97e474d..5a68a92 100644 --- a/swarm-templates/wordpress/config.yml +++ b/swarm-templates/wordpress/config.yml @@ -1,5 +1,5 @@ name: Wordpress description: | Blog tool, publishing platform and CMS -version: latest-rancher1 +version: 1.0.0-latest-rancher1 category: Blogging diff --git a/templates/alfresco/0/rancher-compose.yml b/templates/alfresco/0/rancher-compose.yml index 15c8848..f32096c 100644 --- a/templates/alfresco/0/rancher-compose.yml +++ b/templates/alfresco/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Alfresco" - version: "5.1 201605-GA" + version: "5.1.0-201605-GA" description: "Alfresco Electronic Document Management" uuid: alfresco-5.1-201605-1 minimum_rancher_version: v0.56.0 diff --git a/templates/alfresco/config.yml b/templates/alfresco/config.yml index 3d04415..a65eb4f 100644 --- a/templates/alfresco/config.yml +++ b/templates/alfresco/config.yml @@ -1,5 +1,5 @@ name: Alfresco description: | An ECM and BPM platform. -version: 5.1 201605-GA +version: 5.1.0-201605-GA category: ECM From c14a0ecdfcdca227e546d8ce93346bd60695b1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A1ndor=20Istv=C3=A1n=20Kr=C3=A1cser?= Date: Tue, 13 Sep 2016 06:08:29 +0200 Subject: [PATCH 04/21] Use bekt/logspout-logstash (#266) --- templates/logspout/0/docker-compose.yml | 2 +- templates/logspout/1/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/logspout/0/docker-compose.yml b/templates/logspout/0/docker-compose.yml index 3f4f811..92287fc 100644 --- a/templates/logspout/0/docker-compose.yml +++ b/templates/logspout/0/docker-compose.yml @@ -11,5 +11,5 @@ logspout: io.rancher.scheduler.global: 'true' io.rancher.container.hostname_override: container_name tty: true - image: rancher/logspout-logstash:v0.2.0 + image: bekt/logspout-logstash:latest stdin_open: true diff --git a/templates/logspout/1/docker-compose.yml b/templates/logspout/1/docker-compose.yml index f6005e9..a55d954 100644 --- a/templates/logspout/1/docker-compose.yml +++ b/templates/logspout/1/docker-compose.yml @@ -10,5 +10,5 @@ logspout: io.rancher.scheduler.global: 'true' io.rancher.container.hostname_override: container_name tty: true - image: rancher/logspout-logstash:v0.2.0 + image: bekt/logspout-logstash:latest stdin_open: true From f00316fa150ee35f2e77f925f98a9bd822591c70 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Thu, 15 Sep 2016 16:55:39 -0700 Subject: [PATCH 05/21] update secrets-bridge server version (#283) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 25b4b92..63b2d80 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.0 + image: rancher/secrets-bridge:v0.1.1 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index c84983d..54870cf 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.0 + image: rancher/secrets-bridge:v0.1.1 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From ea47b6acf81400a7ff8f375d66cd56b425ef35e2 Mon Sep 17 00:00:00 2001 From: ddmng Date: Fri, 16 Sep 2016 02:00:56 +0200 Subject: [PATCH 06/21] Improvements in RabbitMQ stack (#280) * Added RabbitMQ with clustering * Moved to `rdaneel` base repo on Docker hub * Wrong tag for `rdaneel/rabbitmq-conf` * merging @andyshinn and @inabhi9 work * merging @andyshinn and @inabhi9 work * erlang cookie moved under environment instead of entrypoint * added defaul cookie * Aligned to dockerfile description * bullets --- templates/rabbitmq-3/1/README.md | 12 +++++++ templates/rabbitmq-3/1/docker-compose.yml | 33 ++++++++++++++++++ templates/rabbitmq-3/1/rancher-compose.yml | 39 ++++++++++++++++++++++ templates/rabbitmq-3/config.yml | 4 +-- 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 templates/rabbitmq-3/1/README.md create mode 100755 templates/rabbitmq-3/1/docker-compose.yml create mode 100755 templates/rabbitmq-3/1/rancher-compose.yml diff --git a/templates/rabbitmq-3/1/README.md b/templates/rabbitmq-3/1/README.md new file mode 100644 index 0000000..5716bb4 --- /dev/null +++ b/templates/rabbitmq-3/1/README.md @@ -0,0 +1,12 @@ +RabbitMQ 3.6 with easy Rancher clustering +=== +Provides RabbitMQ image that can scale to a cluster. + +The following environment variables are passed to confd in order to set up RabbitMQ's configuration file: + +* Partition handling: RabbitMQ's cluster handling setting: default set to autoheal +* Erlang cookie: cookie to allow nodes communication: default set to defaultcookiepleasechange +* Net ticktime: adjusts the frequency of both tick messages and detection of failures: default set to 60 +* Confd args: additional confd args along with default --backend rancher --prefix /2015-07-25: default set to --interval 5 + +*Note*: You can pass an alternate `confd` configuration via the `ALTERNATE_CONF` environment variable. diff --git a/templates/rabbitmq-3/1/docker-compose.yml b/templates/rabbitmq-3/1/docker-compose.yml new file mode 100755 index 0000000..f85f82f --- /dev/null +++ b/templates/rabbitmq-3/1/docker-compose.yml @@ -0,0 +1,33 @@ +rabbitmq: + image: rdaneel/rabbitmq-conf:0.2.0 + labels: + io.rancher.container.hostname_override: container_name + io.rancher.sidekicks: rabbitmq-base,rabbitmq-datavolume + volumes_from: + - rabbitmq-datavolume + environment: + - RABBITMQ_NET_TICKTIME=${net_ticktime} + - RABBITMQ_CLUSTER_PARTITION_HANDLING=${cluster_partition_handling} + - CONFD_ARGS=${confd_args} +rabbitmq-datavolume: + labels: + io.rancher.container.hostname_override: container_name + io.rancher.container.start_once: true + volumes: + - /etc/rabbitmq + - /opt/rancher/bin + entrypoint: /bin/true + image: rabbitmq:3.6-management +rabbitmq-base: + labels: + io.rancher.container.hostname_override: container_name + image: rabbitmq:3.6-management + restart: always + volumes_from: + - rabbitmq-datavolume + net: "container:rabbitmq" + entrypoint: + - /opt/rancher/bin/run.sh + environment: + - RABBITMQ_ERLANG_COOKIE=${erlang_cookie} + diff --git a/templates/rabbitmq-3/1/rancher-compose.yml b/templates/rabbitmq-3/1/rancher-compose.yml new file mode 100755 index 0000000..35f48c5 --- /dev/null +++ b/templates/rabbitmq-3/1/rancher-compose.yml @@ -0,0 +1,39 @@ +.catalog: + name: "Rabbit MQ" + version: "0.2.0" + decription: A reliable, distributed messaging broker + questions: + - variable: "erlang_cookie" + description: "Erlang cookie required for auth" + label: "Erlang cookie:" + required: true + default: defaultcookiepleasechange + type: "string" + - variable: "cluster_partition_handling" + label: "Partition Handling:" + description: "Cluster partition handling mode" + required: true + type: "enum" + default: autoheal + options: + - autoheal + - ignore + - pause_minority + - variable: "net_ticktime" + description: "Rabbitmq net ticktime setting" + label: "Net ticktime:" + required: false + type: "int" + default: 60 + - variable: "confd_args" + description: "Confd additional args" + label: "Confd args" + required: false + type: "string" + default: --interval 5 + +rabbitmq: + metadata: + rabbitmq: + config: + node.name: "$${HOSTNAME}" diff --git a/templates/rabbitmq-3/config.yml b/templates/rabbitmq-3/config.yml index edd833f..7554719 100755 --- a/templates/rabbitmq-3/config.yml +++ b/templates/rabbitmq-3/config.yml @@ -1,5 +1,5 @@ -name: RabbitMQ 3.6.1 +name: RabbitMQ 3.6 description: | Robust messaging for applications -version: 0.1.0 +version: 0.2.0 category: Message queues From 32dd815f9e8a47dd7390c858261ce4a90f66566c Mon Sep 17 00:00:00 2001 From: Justin Soong Date: Fri, 16 Sep 2016 12:02:02 +1200 Subject: [PATCH 07/21] Pull latest cassandra image v1 tag not available anymore (#282) --- kubernetes-templates/cassandra/0/cassandra-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes-templates/cassandra/0/cassandra-controller.yaml b/kubernetes-templates/cassandra/0/cassandra-controller.yaml index 9037ee0..1e7b07d 100644 --- a/kubernetes-templates/cassandra/0/cassandra-controller.yaml +++ b/kubernetes-templates/cassandra/0/cassandra-controller.yaml @@ -30,7 +30,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: llparse/cassandra:v1 + image: llparse/cassandra name: cassandra ports: - containerPort: 9042 From 4fb5393c0ddd3893cc5cdfd9eac198abf106d26f Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Fri, 16 Sep 2016 12:50:13 -0700 Subject: [PATCH 08/21] updated to new version (#284) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 63b2d80..6b6fec0 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.1 + image: rancher/secrets-bridge:v0.1.2 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 54870cf..b165150 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.1 + image: rancher/secrets-bridge:v0.1.2 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From 66713b3a94e79fe51f595e2c6804372c3dcaf3fb Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Fri, 16 Sep 2016 13:26:34 -0700 Subject: [PATCH 09/21] added load balancer to secrets-bridge server (#281) --- .../secrets-bridge-server/0/docker-compose.yml | 6 ++++++ .../secrets-bridge-server/0/rancher-compose.yml | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index b165150..88d6360 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -16,3 +16,9 @@ secrets-bridge: - ${CATTLE_SECRET_KEY} - --rancher-access - ${CATTLE_ACCESS_KEY} +secrets-bridge-lb: + ports: + - "${LBPORT}:8081" + image: rancher/load-balancer-service + links: + - secrets-bridge:secrets-bridge diff --git a/templates/secrets-bridge-server/0/rancher-compose.yml b/templates/secrets-bridge-server/0/rancher-compose.yml index eb2116a..33cd440 100644 --- a/templates/secrets-bridge-server/0/rancher-compose.yml +++ b/templates/secrets-bridge-server/0/rancher-compose.yml @@ -34,3 +34,17 @@ label: "Vault Cubbyhole Path" required: true description: "Path to get the permenant API key" + - variable: LBPORT + description: "Port for Secrets Bridge LB to listen on" + type: string + required: true +secrets-bridge-lb: + scale: 1 + load_balancer_config: + haproxy_config: {} + health_check: + port: 42 + interval: 2000 + unhealthy_threshold: 3 + healthy_threshold: 2 + response_timeout: 2000 From c2013db4534a877704ddb700eed999ac3a7d828a Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Fri, 16 Sep 2016 15:43:46 -0700 Subject: [PATCH 10/21] Bumping version to v0.1.3 (#285) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 6b6fec0..acd996b 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.2 + image: rancher/secrets-bridge:v0.1.3 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 88d6360..2c78a68 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.2 + image: rancher/secrets-bridge:v0.1.3 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From 401ef671ef479b4ec07ba523253aef7ebf53431d Mon Sep 17 00:00:00 2001 From: Jan B Date: Sat, 17 Sep 2016 00:44:47 +0200 Subject: [PATCH 11/21] Datadog template 11.3.585 (#279) --- templates/datadog/4/README.md | 16 ++++ templates/datadog/4/docker-compose.yml | 41 +++++++++ templates/datadog/4/rancher-compose.yml | 107 ++++++++++++++++++++++++ templates/datadog/README.md | 3 - templates/datadog/config.yml | 2 +- 5 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 templates/datadog/4/README.md create mode 100755 templates/datadog/4/docker-compose.yml create mode 100755 templates/datadog/4/rancher-compose.yml diff --git a/templates/datadog/4/README.md b/templates/datadog/4/README.md new file mode 100644 index 0000000..7eed15e --- /dev/null +++ b/templates/datadog/4/README.md @@ -0,0 +1,16 @@ +# DataDog Agent + +This template deploys a [DataDog](https://www.datadoghq.com/) agent stack consisting of the official [docker-dd-agent](https://www.github.com/Datadog/docker-dd-agent) image and a configuration sidekick that provides closer integration with Rancher: + +* Hosts in Datadog are named correctly +* Host labels can be exported as DataDog host tags +* Service labels can be exported as DataDog metric tags + +## Service Discovery +Please refer to the Datadog documentation [here](http://docs.datadoghq.com/guides/servicediscovery/) to learn how to provide configuration templates for Service Discovery in etcd or Consul. + +## Changelog + +**11.3.585** + +* Support for specifying connection options for Consul backends (ACL token, scheme, SSL certificate verification) \ No newline at end of file diff --git a/templates/datadog/4/docker-compose.yml b/templates/datadog/4/docker-compose.yml new file mode 100755 index 0000000..dd6057d --- /dev/null +++ b/templates/datadog/4/docker-compose.yml @@ -0,0 +1,41 @@ +datadog-init: + image: janeczku/datadog-rancher-init:v2.2.3 + net: none + command: /bin/true + volumes: + - /opt/rancher + labels: + io.rancher.container.start_once: 'true' + io.rancher.container.pull_image: always +datadog-agent: + image: datadog/docker-dd-agent:11.3.585 + entrypoint: /opt/rancher/entrypoint-wrapper.py + command: + - supervisord + - -n + - -c + - /etc/dd-agent/supervisor.conf + restart: always + environment: + API_KEY: ${api_key} + SD_BACKEND_HOST: ${sd_backend_host} + SD_BACKEND_PORT: ${sd_backend_port} + SD_TEMPLATE_DIR: ${sd_template_dir} + STATSD_METRIC_NAMESPACE: ${statsd_namespace} + DD_STATSD_STANDALONE: "${statsd_standalone}" + DD_HOST_LABELS: ${host_labels} + DD_CONTAINER_LABELS: ${service_labels} + DD_SERVICE_DISCOVERY: ${service_discovery} + DD_SD_CONFIG_BACKEND: ${sd_config_backend} + DD_CONSUL_TOKEN: ${dd_consul_token} + DD_CONSUL_SCHEME: ${dd_consul_scheme} + DD_CONSUL_VERIFY: ${dd_consul_verify} + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /proc/:/host/proc/:ro + - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro + volumes_from: + - datadog-init + labels: + io.rancher.scheduler.global: "${global_service}" + io.rancher.sidekicks: 'datadog-init' diff --git a/templates/datadog/4/rancher-compose.yml b/templates/datadog/4/rancher-compose.yml new file mode 100755 index 0000000..3f05a4a --- /dev/null +++ b/templates/datadog/4/rancher-compose.yml @@ -0,0 +1,107 @@ +.catalog: + name: "DataDog" + version: "11.3.585-rancher1" + description: "Real-time performance tracking and visualization of your container-based application deployment" + minimum_rancher_version: v0.46.0 + questions: + - variable: "api_key" + label: "DataDog Api Key" + description: | + Enter your DataDog API key. + required: true + type: "string" + - variable: "global_service" + label: "Global Service" + description: | + Enable this option to run a DataDog agent container on every host in the environment. + required: true + type: "boolean" + default: true + - variable: "host_labels" + label: "Export Host Labels as Tags" + description: | + Comma delimited list of host labels to export as DataDog host tags, e.g. 'region,zone'. + required: false + type: "string" + - variable: "service_labels" + label: "Export Service Labels as Tags" + description: | + Comma delimited list of service labels to export as DataDog metric tags. + 'io.rancher.stack.name' and 'io.rancher.stack_service.name' are exported by default. + required: false + type: "string" + - variable: "service_discovery" + label: "Enable Service Discovery" + description: | + Collect metrics from supported applications running in Docker containers. + required: true + type: "boolean" + default: false + - variable: sd_config_backend + label: Service Discovery Configuration Backend + description: | + Choose a key/value store to use for looking up application configuration templates. + If none is provided only auto config templates will be used. + required: true + type: enum + default: none + options: + - none + - etcd + - consul + - variable: "sd_backend_host" + label: "Configuration Backend Host" + description: | + IP address or DNS name to use to connect to the configuration backend. + required: false + type: "string" + - variable: "sd_backend_port" + label: "Configuration Backend Port" + description: | + Port to use to connect to the configuration backend. + required: false + type: "int" + - variable: "sd_template_dir" + label: "Configuration Backend Template Path" + description: | + Specify a custom path where the agent should look for configuration templates in the backend. + The default is '/datadog/check_configs'. + required: false + type: "string" + - variable: "dd_consul_scheme" + label: "Consul Connection Scheme" + description: | + Scheme to use for requests to a Consul backend. + required: false + type: enum + default: http + options: + - http + - https + - variable: "dd_consul_verify" + label: "Verify Consul SSL Certificate" + description: | + Whether to verify the SSL certificate for HTTPS requests to a Consul backend. + required: false + type: "boolean" + default: true + - variable: "dd_consul_token" + label: "Consul ACL Token" + description: | + If the Consul backend uses ACL, specify a token granting read access to the configuration templates. + required: false + type: "string" + - variable: "statsd_standalone" + label: "Run Standalone DogStatsD" + description: | + Enable this option to run just the DogStatsD service without the full agent. + Should be used with the Global Service option set 'False'. + required: true + type: "boolean" + default: false + - variable: "statsd_namespace" + label: "StatsD Metric Namespace" + description: | + Optional namespace for aggregated StatsD metrics. + required: false + type: "string" diff --git a/templates/datadog/README.md b/templates/datadog/README.md index a9c6c38..9d66c95 100644 --- a/templates/datadog/README.md +++ b/templates/datadog/README.md @@ -5,6 +5,3 @@ This template deploys a [DataDog](https://www.datadoghq.com/) agent stack consis * Hosts in Datadog are named correctly * Host labels can be exported as DataDog host tags * Service labels can be exported as DataDog metric tags - -## Service Discovery -Please refer to the Datadog documentation [here](http://docs.datadoghq.com/guides/servicediscovery/) to learn how to provide configuration templates for Service Discovery in etcd or Consul. \ No newline at end of file diff --git a/templates/datadog/config.yml b/templates/datadog/config.yml index af2d0c7..a00e748 100755 --- a/templates/datadog/config.yml +++ b/templates/datadog/config.yml @@ -1,7 +1,7 @@ name: Datadog description: | Real-time performance tracking and visualization of your container-based application deployment -version: 11.1.580-rancher1 +version: 11.3.585-rancher1 category: Monitoring maintainer: "Jan Bruder " license: The MIT License From c4e6375e07ed0fa14270ec141a012798b8489d22 Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Sun, 18 Sep 2016 21:48:59 -0700 Subject: [PATCH 12/21] Portworx template for Rancher (#277) * add portworx to rancher catalog * Update docker-compose.yml * Update config.yml * Update README.md --- templates/portworx/0/README.md | 6 ++ templates/portworx/0/docker-compose.yml | 22 +++++++ templates/portworx/0/rancher-compose.yml | 13 +++++ templates/portworx/catalogIcon-portworx.svg | 64 +++++++++++++++++++++ templates/portworx/config.yml | 5 ++ 5 files changed, 110 insertions(+) create mode 100644 templates/portworx/0/README.md create mode 100644 templates/portworx/0/docker-compose.yml create mode 100644 templates/portworx/0/rancher-compose.yml create mode 100644 templates/portworx/catalogIcon-portworx.svg create mode 100644 templates/portworx/config.yml diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md new file mode 100644 index 0000000..6559d97 --- /dev/null +++ b/templates/portworx/0/README.md @@ -0,0 +1,6 @@ +## Cluster Token Needed +Please contact support@portworx.com for a Cluster Token + +## Product Documentation +[Portworx Documentation] (https://docs.portworx.com) + diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml new file mode 100644 index 0000000..172d227 --- /dev/null +++ b/templates/portworx/0/docker-compose.yml @@ -0,0 +1,22 @@ +portworx: + labels: + io.rancher.container.create_agent: 'true' + io.rancher.scheduler.global: 'true' + io.rancher.container.pull_image: 'always' + image: portworx/px-dev + container_name: px + ipc: host + net: host + privileged: true + environment: + CLUSTER_TOKEN: ${cluster_token} + volumes: + - /dev:/dev + - /usr/src:/usr/src + - /run/docker/plugins:/run/docker/plugins + - /var/lib/osd:/var/lib/osd:shared + - /etc/pwx:/etc/pwx + - /opt/pwx/bin:/export_bin:shared + - /var/run/docker.sock:/var/run/docker.sock + - /var/cores:/var/cores + command: -t ${cluster_token} -a -f diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml new file mode 100644 index 0000000..6388df7 --- /dev/null +++ b/templates/portworx/0/rancher-compose.yml @@ -0,0 +1,13 @@ +.catalog: + name: "Portworx" + version: "1.0.2-2016-09-07-GA" + description: "Container Defined Storage for Docker" + uuid: 352669-pwx-1.0.2 + minimum_rancher_version: v0.56.0 + questions: + - variable: cluster_token + description: "Cluster Token from Lighthouse" + label: "Cluster Token" + type: "string" + required: true + default: "" diff --git a/templates/portworx/catalogIcon-portworx.svg b/templates/portworx/catalogIcon-portworx.svg new file mode 100644 index 0000000..327db0b --- /dev/null +++ b/templates/portworx/catalogIcon-portworx.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/portworx/config.yml b/templates/portworx/config.yml new file mode 100644 index 0000000..e47bae9 --- /dev/null +++ b/templates/portworx/config.yml @@ -0,0 +1,5 @@ +name: px-dev +description: | + Software defined enterprise storage for Linux Containers. +version: 1.0.2-2016-09-07-GA +category: Storage From d3e05ea7b4dc8adc260208700cd99769c808f840 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Sun, 18 Sep 2016 21:52:49 -0700 Subject: [PATCH 13/21] updated ports (#287) --- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 2c78a68..c9391a2 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -18,7 +18,7 @@ secrets-bridge: - ${CATTLE_ACCESS_KEY} secrets-bridge-lb: ports: - - "${LBPORT}:8081" + - "${LBPORT}:8181" image: rancher/load-balancer-service links: - secrets-bridge:secrets-bridge From 03a106ff9a173a118428e79581843a57e23dc47a Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Mon, 19 Sep 2016 11:37:58 -0700 Subject: [PATCH 14/21] updated label for port (#288) --- templates/secrets-bridge-server/0/rancher-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/secrets-bridge-server/0/rancher-compose.yml b/templates/secrets-bridge-server/0/rancher-compose.yml index 33cd440..e2d06b3 100644 --- a/templates/secrets-bridge-server/0/rancher-compose.yml +++ b/templates/secrets-bridge-server/0/rancher-compose.yml @@ -36,6 +36,7 @@ description: "Path to get the permenant API key" - variable: LBPORT description: "Port for Secrets Bridge LB to listen on" + label: "LB Port" type: string required: true secrets-bridge-lb: From 3b2a59ca98fd00052cb59894041f67ebb0f2caea Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Wed, 21 Sep 2016 21:12:46 -0700 Subject: [PATCH 15/21] updated versions (#290) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index acd996b..5e439e8 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.3 + image: rancher/secrets-bridge:v0.1.4 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index c9391a2..6a9c384 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.3 + image: rancher/secrets-bridge:v0.1.4 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From 9a06ee761ac2d21bb4502d1e98aa4cd3be0d715a Mon Sep 17 00:00:00 2001 From: Jeff Silberman Date: Thu, 22 Sep 2016 13:30:33 -0700 Subject: [PATCH 16/21] Update README.md (#291) Change doc site from https to http --- templates/portworx/0/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md index 6559d97..7e22834 100644 --- a/templates/portworx/0/README.md +++ b/templates/portworx/0/README.md @@ -2,5 +2,5 @@ Please contact support@portworx.com for a Cluster Token ## Product Documentation -[Portworx Documentation] (https://docs.portworx.com) +[Portworx Documentation] (http://docs.portworx.com) From 0d318696f8c0b8feb3963548e77988358bb03b49 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 22 Sep 2016 22:33:54 +0200 Subject: [PATCH 17/21] upgrade janitor to latest image version, docker 1.9+ support (#154) * Janitor: new docker-cleanup image version The initial motivation for this version bump is support for docker 1.9+ Currently volumes don't get removed properly and lead to containers to stall at start up, which is a pain to diagnose in rancher. ref: https://github.com/meltwater/docker-cleanup/issues/24 * janitor: add support for KEEP_CONTAINERS_NAMED feature * janitor: document '**None**' and '**All**' * janitor: run with privileged mode unconditionnally According to @sshipway, it seemed to be incompatible with a lot of docker/rancher versions. * janitor: bump docker-cleanup image version to 1.8.0 --- templates/janitor/3/docker-compose.yml | 20 ++++++++++++++ templates/janitor/3/rancher-compose.yml | 36 +++++++++++++++++++++++++ templates/janitor/README.md | 8 +++--- templates/janitor/config.yml | 2 +- 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 templates/janitor/3/docker-compose.yml create mode 100644 templates/janitor/3/rancher-compose.yml diff --git a/templates/janitor/3/docker-compose.yml b/templates/janitor/3/docker-compose.yml new file mode 100644 index 0000000..3109a9a --- /dev/null +++ b/templates/janitor/3/docker-compose.yml @@ -0,0 +1,20 @@ +cleanup: + image: meltwater/docker-cleanup:1.8.0 + environment: + CLEAN_PERIOD: ${FREQUENCY} + DELAY_TIME: "900" + KEEP_IMAGES: "${KEEP}" + KEEP_CONTAINERS: "${KEEPC}" + KEEP_CONTAINERS_NAMED: "${KEEPCN}" + LOOP: "true" + DEBUG: "0" + labels: + io.rancher.scheduler.global: "true" + io.rancher.scheduler.affinity:host_label_ne: "${EXCLUDE_LABEL}" + net: none + privileged: true + tty: false + stdin_open: false + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /var/lib/docker:/var/lib/docker diff --git a/templates/janitor/3/rancher-compose.yml b/templates/janitor/3/rancher-compose.yml new file mode 100644 index 0000000..19ca95b --- /dev/null +++ b/templates/janitor/3/rancher-compose.yml @@ -0,0 +1,36 @@ +.catalog: + name: "Janitor" + version: "v1.7" + description: "Docker cleanup" + uuid: janitor-3 + questions: + - variable: "FREQUENCY" + label: "Frequency" + description: "Run the cleanup on a cycle of this many seconds" + default: 3600 + required: true + type: "int" + - variable: "EXCLUDE_LABEL" + label: "Exclude label" + description: "Specify a Rancher host label here that will be used to determine on which hosts the Janitor container should not deploy." + default: janitor.exclude=true + required: true + type: "string" + - variable: "KEEP" + label: "Keep images" + description: "A comma separated list of images that should never be removed. These are left-anchored Bash Shell Wildcard patterns." + default: "rancher/" + required: false + type: "string" + - variable: "KEEPC" + label: "Keep containers" + description: "A comma separated list of images that should never have stopped containers removed. These are left-anchored Bash Shell Wildcard patterns." + default: "*:*" + required: false + type: "string" + - variable: "KEEPCN" + label: "Keep named containers" + description: "A comma separated list of names of exited or dead container that should never be removed. These are left-anchored Bash Shell Wildcard patterns." + default: "**None**" + required: false + type: "string" diff --git a/templates/janitor/README.md b/templates/janitor/README.md index 68f08d5..a60f94b 100644 --- a/templates/janitor/README.md +++ b/templates/janitor/README.md @@ -15,13 +15,13 @@ that are taking up space; note that this may not be what you want if you are using stopped containers to hold volumes! If this is the case, use the Keep List below. -This cleanup will help to prevent the /var/lib/docker filesystem from filling +This cleanup will help to prevent the /var/lib/docker filesystem from filling up with old and unused container images, which is an issue on lighter-weight Docker hosts. ### Keep list -You can specify match patterns for unused Images, and stopped Containers, +You can specify match patterns for unused Images, and stopped Containers, which should be excluded from the cleanup. The match patterns are comma-separated Left Anchored Bash Shell wildcard @@ -40,9 +40,11 @@ However it will not match * bar:latest * foo/\*:v1 -By default, nothing will be matched. If you want to match everything, +By default, nothing will be matched. If you want to match everything, then use a pattern **\*:\*** +The self-descriptive values '\*\*None\*\*' and '\*\*All\*\*' can also be used. + ### Warning If you are using 'run-once' sidekick containers that mount a volume, then diff --git a/templates/janitor/config.yml b/templates/janitor/config.yml index e0241f0..082b015 100644 --- a/templates/janitor/config.yml +++ b/templates/janitor/config.yml @@ -1,7 +1,7 @@ name: Janitor description: | Automatic cleanup of unused images on hosts, in order to save disk space. -version: v1.6 +version: v1.7 category: Monitoring maintainer: Steve Shipway From 2d4a62d559e685f46c0d8041d1dd56e22a18ce04 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Thu, 22 Sep 2016 13:42:04 -0700 Subject: [PATCH 18/21] updated to v0.1.5 (#292) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 5e439e8..5771ef8 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.4 + image: rancher/secrets-bridge:v0.1.5 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 6a9c384..d7549b7 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.4 + image: rancher/secrets-bridge:v0.1.5 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From f8bb75fe052e65fe23c56a75648328d402ca5655 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Thu, 22 Sep 2016 17:25:26 -0700 Subject: [PATCH 19/21] updated for 016 of secrets bridge (#293) --- .../0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/README.md | 52 +------------------ .../0/docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 52 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index 5771ef8..ffc21fa 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.5 + image: rancher/secrets-bridge:v0.1.6 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/README.md b/templates/secrets-bridge-server/0/README.md index 9882ca5..574beaf 100644 --- a/templates/secrets-bridge-server/0/README.md +++ b/templates/secrets-bridge-server/0/README.md @@ -1,59 +1,11 @@ -## Secrets Bridge Server (Experimental) ---- -###Status: Experimental POC (Read: Do NOT use for production) -Only works with Hashicorp Vault server in dev mode currently. - +## Secrets Bridge Server (Beta) --- #### Description: This is the server side component for the Vault Secrets bridge with Rancher. This service should *NOT* be deployed in the same environment as user applications. It will have access to Vault, and compromising it will give the person access to *ALL* secrets available in that environment. It should instead be run in an environment reserved for the team operating Rancher. The reason this uses a temporary Cubbyhole token to start the service is that ENV variables do show up in the Rancher API and Docker inspect commands. That said, if this service fails, the issuing token will expire and all app tokens will also expire. - + #### Setup See [setup guide](https://github.com/rancher/secrets-bridge/blob/master/docs/setup.md) -#### Pre-reqs: - -A Vault server in Dev mode. - -Create Vault Policies and Roles for at least the Issuing token. -Something like: - -``` - vault policy-write grantor-Default ./policies/grantor-Default - vault policy-write test1 ./policies/test1 - vault policy-write test2 ./policies/test2 -``` - - -``` -curl -s -X POST -H "X-Vault-Token: ${VAULT_TOKEN}" -d '{"allowed_policies": "default,grantor,test1,test2"}' http://vault/v1/auth/token/roles/grantor-Default -``` - -#### Configure and Launch: - 1. Create a token to be used to issue new tokens in the environment. As part of the "meta" on the token add a field called `configPath` and set that equal to a path in the secrets folder in Vault. (like `/secrets/secrets-bridge/Default`) - - - ``` -curl -s -X POST -H "X-Vault-Token: $ROOT_TOKEN" ${VAULT_URL}/v1/auth/token/create/grantor-Default -d '{"policies": ["default", "grantor", "test1", "test2"], "ttl": "72h", "meta": {"configPath": "secret/secrets-bridge/Default"}}' | jq -r '.auth.client_token' - ``` - - - 2. Create a temporary token with (2) uses. - - ``` - curl -s -H "X-Vault-Token: $ROOT_TOKEN" ${VAULT_URL}/v1/auth/token/create -d '{"policies": ["default"], "ttl": "15m", "num_uses": 2}'|jq -r '.auth.client_token' - ``` - - 3. Use the temporary token to put the issuing token into the Vault cubbyhole. - - ``` - curl -X POST -H "X-Vault-Token: ${TEMP_TOKEN}" ${VAULT_URL}/v1/cubbyhole/Default -d "{\"permKey\": \"${PERM_TOKEN}\"}" - ``` - - 4. Create Cattle API keys for the environment this server will be handling. (Would recommend 1 server per environment) - - 5. Launch this app with all of the configs. - - diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index d7549b7..1ae570c 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.5 + image: rancher/secrets-bridge:v0.1.6 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From c154d188acba912dbed8a24ea3b60734170d847a Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Wed, 28 Sep 2016 12:00:43 -0700 Subject: [PATCH 20/21] Updated to new image version (#296) --- templates/secrets-bridge-agents/0/docker-compose.yml | 2 +- templates/secrets-bridge-server/0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/secrets-bridge-agents/0/docker-compose.yml b/templates/secrets-bridge-agents/0/docker-compose.yml index ffc21fa..750d138 100644 --- a/templates/secrets-bridge-agents/0/docker-compose.yml +++ b/templates/secrets-bridge-agents/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.6 + image: rancher/secrets-bridge:v0.1.7 command: agent --bridge-url ${BRIDGE_URL} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/templates/secrets-bridge-server/0/docker-compose.yml b/templates/secrets-bridge-server/0/docker-compose.yml index 1ae570c..ef8f3a8 100644 --- a/templates/secrets-bridge-server/0/docker-compose.yml +++ b/templates/secrets-bridge-server/0/docker-compose.yml @@ -1,5 +1,5 @@ secrets-bridge: - image: rancher/secrets-bridge:v0.1.6 + image: rancher/secrets-bridge:v0.1.7 environment: CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY} CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY} From 3dccc339f1f4d4c25a7ca8c1caa85aaebb87f9db Mon Sep 17 00:00:00 2001 From: Sander Kleykens Date: Mon, 3 Oct 2016 21:21:48 +0200 Subject: [PATCH 21/21] Add Confluence template (#301) --- templates/confluence/0/docker-compose.yml | 13 +++ templates/confluence/0/rancher-compose.yml | 69 +++++++++++++++ .../confluence/catalogIcon-confluence.svg | 85 +++++++++++++++++++ templates/confluence/config.yml | 5 ++ 4 files changed, 172 insertions(+) create mode 100644 templates/confluence/0/docker-compose.yml create mode 100644 templates/confluence/0/rancher-compose.yml create mode 100644 templates/confluence/catalogIcon-confluence.svg create mode 100644 templates/confluence/config.yml diff --git a/templates/confluence/0/docker-compose.yml b/templates/confluence/0/docker-compose.yml new file mode 100644 index 0000000..9929793 --- /dev/null +++ b/templates/confluence/0/docker-compose.yml @@ -0,0 +1,13 @@ +confluence: + image: sanderkleykens/confluence:5.10.6 + restart: always + environment: + - CATALINA_OPTS=-Xms${heap_size} -Xmx${heap_size} ${jvm_args} + - CONFLUENCE_PROXY_PORT=${proxy_port} + - CONFLUENCE_PROXY_NAME=${proxy_name} + - CONFLUENCE_PROXY_SCHEME=${proxy_scheme} + - CONFLUENCE_CONTEXT_PATH=${context_path} + external_links: + - ${database_link}:database + volumes: + - ${confluence_home}:/var/atlassian/confluence diff --git a/templates/confluence/0/rancher-compose.yml b/templates/confluence/0/rancher-compose.yml new file mode 100644 index 0000000..9eb3bfc --- /dev/null +++ b/templates/confluence/0/rancher-compose.yml @@ -0,0 +1,69 @@ +.catalog: + name: "Confluence" + version: "5.10.6" + description: "Create, organize, and discuss work with your team" + questions: + - variable: "context_path" + label: "Context path" + description: | + The context path under which Confluence will be available + type: "string" + default: "/confluence" + required: true + - variable: "proxy_name" + label: "Proxy name" + description: | + When behind a proxy, specify the name through which clients will connect to Confluence. For example: confluence.mycompany.com + type: "string" + required: false + - variable: "proxy_port" + label: "Proxy port" + description: | + When behind a proxy, specify the port through which clients will connect to Confluence + type: "int" + required: false + - variable: "proxy_scheme" + label: "Proxy scheme" + description: | + When behind a proxy, specify the protocol clients will use to connect to Confluence + type: "enum" + options: + - http + - https + default: http + required: false + - variable: "heap_size" + label: "Heap size" + description: | + The size of the heap the JVM can allocate + type: "string" + default: "1024m" + required: true + - variable: "jvm_args" + label: "JVM arguments" + description: | + Additional arguments to pass to the JVM + type: "string" + required: false + - variable: "database_link" + label: "Database" + description: | + Service link to the database. This will be mapped to the container as 'database' + type: "service" + required: false + - variable: "confluence_home" + label: "Confluence home directory" + description: | + The location to mount the Confluence home directory on + type: "string" + required: true +confluence: + scale: 1 + health_check: + port: 8090 + interval: 2000 + initializing_timeout: 60000 + unhealthy_threshold: 3 + strategy: recreate + healthy_threshold: 2 + response_timeout: 2000 diff --git a/templates/confluence/catalogIcon-confluence.svg b/templates/confluence/catalogIcon-confluence.svg new file mode 100644 index 0000000..e62e807 --- /dev/null +++ b/templates/confluence/catalogIcon-confluence.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/confluence/config.yml b/templates/confluence/config.yml new file mode 100644 index 0000000..e1d0af3 --- /dev/null +++ b/templates/confluence/config.yml @@ -0,0 +1,5 @@ +name: Confluence +description: | + Create, organize, and discuss work with your team +version: 5.10.6 +category: Collaboration