This commit is contained in:
Jeff Silberman 2016-10-05 14:22:31 +02:00
commit 4c5c1cf1a3
30 changed files with 524 additions and 68 deletions

View File

@ -30,7 +30,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: llparse/cassandra:v1
image: llparse/cassandra
name: cassandra
ports:
- containerPort: 9042

View File

@ -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

View File

@ -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:

View File

@ -1,5 +1,5 @@
name: Wordpress
description: |
Blog tool, publishing platform and CMS
version: latest-rancher1
version: 1.0.0-latest-rancher1
category: Blogging

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Conf_-_Blue" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" width="984.127px" height="267.72px" viewBox="0 0 984.127 267.72" style="enable-background:new 0 0 984.127 267.72;"
xml:space="preserve">
<style type="text/css">
.st0{fill:#205081;}
</style>
<g>
<g>
<path class="st0" d="M313.082,136.502c-26.125,0-39.936,12.551-39.936,36.295v22.383c0,23.744,13.811,36.295,39.936,36.295
c26.127,0,39.938-12.551,39.938-36.295v-22.383C353.02,149.053,339.209,136.502,313.082,136.502z M298.053,172.068
c0-9.769,4.494-13.938,15.029-13.938c10.535,0,15.031,4.169,15.031,13.938v23.84c0,9.77-4.496,13.938-15.031,13.938
c-10.535,0-15.029-4.168-15.029-13.938V172.068z"/>
<path class="st0" d="M420.582,136.502c-9.861,0-23.293,3.4-34.643,8.728l-1.357-4.642c-0.395-1.342-1.625-2.267-3.023-2.267
h-13.779c-1.738,0-3.15,1.411-3.15,3.151v85.033c0,1.74,1.412,3.15,3.15,3.15h18.605c1.74,0,3.15-1.41,3.15-3.15v-58.893
c6.703-3.409,16.125-6.934,21.766-6.934c4.19,0,5.746,1.558,5.746,5.748v60.078c0,1.74,1.412,3.15,3.15,3.15h18.605
c1.74,0,3.15-1.41,3.15-3.15v-62.445C441.953,145.775,434.764,136.502,420.582,136.502z"/>
<path class="st0" d="M509.053,103.04c-5.016-1.279-10.787-1.984-16.25-1.984c-19.893,0-29.562,9.432-29.562,28.833v11.025h-10.328
c-1.74,0-3.15,1.41-3.15,3.152v14.055c0,1.738,1.41,3.149,3.15,3.149h10.328v65.236c0,1.74,1.412,3.15,3.15,3.15h18.605
c1.738,0,3.15-1.41,3.15-3.15V161.27h18.27c1.65,0,3.021-1.275,3.141-2.922l0.006-14.057c0-1.032-0.236-1.729-0.834-2.371
c-0.598-0.641-1.432-1.006-2.307-1.006h-18.275v-9.752c0-6.795,1.307-9.206,8.66-9.206c2.272,0,5.736,0.352,9.047,0.917
c0.838,0.144,1.703-0.06,2.391-0.564s1.143-1.263,1.26-2.11l1.891-13.675C511.615,104.938,510.607,103.438,509.053,103.04z"/>
<path class="st0" d="M542.688,103.498h-18.605c-1.738,0-3.15,1.41-3.15,3.15v119.857c0,1.74,1.412,3.15,3.15,3.15h18.605
c1.74,0,3.15-1.41,3.15-3.15V106.648C545.838,104.908,544.428,103.498,542.688,103.498z"/>
<path class="st0" d="M633.816,138.321h-18.605c-1.738,0-3.15,1.411-3.15,3.151v58.891c-6.703,3.41-16.125,6.936-21.764,6.936
c-4.189,0-5.748-1.557-5.748-5.748v-60.078c0-1.74-1.41-3.151-3.15-3.151h-18.605c-1.738,0-3.15,1.411-3.15,3.151v62.444
c0,18.287,7.191,27.558,21.373,27.558c9.861,0,23.293-3.4,34.641-8.727l1.359,4.643c0.393,1.343,1.623,2.266,3.023,2.266h13.777
c1.74,0,3.15-1.41,3.15-3.15v-85.033C636.967,139.732,635.557,138.321,633.816,138.321z"/>
<path class="st0" d="M685.906,136.502c-24.935,0-38.117,12.424-38.117,35.932v23.475c0,24.266,12.344,35.566,38.844,35.566
c10.803,0,22.305-1.887,31.559-5.178c1.482-0.525,2.348-2.064,2.029-3.604l-2.75-13.316c-0.176-0.856-0.701-1.602-1.449-2.055
c-0.748-0.454-1.65-0.578-2.494-0.339c-8.537,2.417-16.68,3.591-24.893,3.591c-13.555,0-15.939-4.377-15.939-13.573V193.8h46.172
c1.74,0,3.152-1.409,3.152-3.15v-17.124C722.02,148.266,710.543,136.502,685.906,136.502z M672.695,173.268v-3.018
c0-8.766,4.254-12.846,13.393-12.846c10.09,0,12.117,4.914,12.117,12.846v3.018H672.695z"/>
<path class="st0" d="M789.244,136.502c-9.861,0-23.293,3.4-34.643,8.728l-1.359-4.642c-0.393-1.342-1.625-2.267-3.021-2.267
h-13.779c-1.738,0-3.15,1.411-3.15,3.151v85.033c0,1.74,1.412,3.15,3.15,3.15h18.605c1.74,0,3.15-1.41,3.15-3.15v-58.893
c6.703-3.409,16.125-6.934,21.766-6.934c4.19,0,5.746,1.558,5.746,5.748v60.078c0,1.74,1.412,3.15,3.15,3.15h18.606
c1.74,0,3.15-1.41,3.15-3.15v-62.445C810.615,145.775,803.426,136.502,789.244,136.502z"/>
<path class="st0" d="M882.271,210.396c-0.131-0.869-0.617-1.642-1.342-2.136c-0.725-0.494-1.621-0.665-2.479-0.468
c-5.342,1.224-10.939,1.871-16.189,1.871c-11.801,0-15.213-3.004-15.213-13.393v-24.566c0-10.389,3.412-13.392,15.213-13.392
c3.248,0,10.242,0.495,16.191,1.859c0.855,0.194,1.754,0.026,2.479-0.467c0.725-0.494,1.211-1.269,1.342-2.136l2.207-14.719
c0.232-1.555-0.717-3.043-2.225-3.488c-7.164-2.111-15.543-2.861-20.541-2.861c-28.107,0-39.572,10.252-39.572,35.386v24.202
c0,25.133,11.465,35.385,39.572,35.385c6.84,0,14.719-1.094,20.56-2.854c1.498-0.451,2.44-1.936,2.207-3.483L882.271,210.396z"/>
<path class="st0" d="M929.408,136.502c-24.934,0-38.115,12.424-38.115,35.932v23.475c0,24.266,12.344,35.566,38.844,35.566
c10.803,0,22.305-1.887,31.559-5.178c1.482-0.525,2.348-2.064,2.029-3.604l-2.75-13.316c-0.176-0.856-0.701-1.602-1.449-2.055
c-0.748-0.454-1.65-0.578-2.494-0.339c-8.537,2.417-16.68,3.591-24.893,3.591c-13.555,0-15.939-4.377-15.939-13.573V193.8h46.174
c1.738,0,3.15-1.409,3.15-3.15v-17.124C965.523,148.266,954.047,136.502,929.408,136.502z M916.199,173.268v-3.018
c0-8.766,4.256-12.846,13.393-12.846c10.09,0,12.117,4.914,12.117,12.846v3.018H916.199z"/>
</g>
<path class="st0" d="M233.697,127.575c7.453,0,17.764,1.024,27.58,2.739c0.848,0.148,1.719-0.058,2.41-0.568
c0.693-0.51,1.147-1.28,1.256-2.133l2.102-16.371c0.205-1.595-0.826-3.09-2.391-3.463c-9.852-2.356-21.104-3.653-31.686-3.653
c-29.52,0-44.486,12.272-44.486,36.476V195.2c0,24.204,14.967,36.478,44.486,36.478c10.582,0,21.834-1.299,31.686-3.652
c1.564-0.376,2.596-1.869,2.391-3.467l-2.102-16.369c-0.109-0.852-0.562-1.624-1.254-2.135c-0.693-0.51-1.568-0.713-2.412-0.567
c-9.818,1.717-20.129,2.741-27.58,2.741c-14.641,0-19.58-4.299-19.58-17.033v-46.589
C214.117,131.872,219.057,127.575,233.697,127.575z"/>
<g>
<path class="st0" d="M126.997,197.8c-2.016-3.974-4.405-7.991-7.199-12.077c-2.001-2.929-4.146-5.778-6.388-8.567
c-0.911-1.136-0.529-2.548,0.167-3.25c0.688-0.705,1.381-1.409,2.076-2.121c9.58-9.77,19.487-19.872,27.084-30.786
c8.08-11.61,12.557-22.623,13.686-33.953c0.113-1.139-0.404-2.347-1.323-3.049c-0.604-0.46-1.333-0.699-2.071-0.699
c-0.408,0-0.823,0.075-1.216,0.226c-7.367,2.817-14.847,4.957-21.676,6.547c-1.392,0.325-2.517,1.359-2.983,2.602
c-4.976,13.627-17.679,26.603-31.006,40.194c-0.535,0.508-1.285,1.178-2.504,1.178c-1.218,0-1.96-0.648-2.504-1.178
c-13.327-13.592-26.03-26.521-31.006-40.15c-0.467-1.24-1.593-2.275-2.983-2.601c-6.832-1.591-14.317-3.912-21.674-6.729
c-0.396-0.15-0.81-0.226-1.22-0.226c-0.737,0-1.467,0.239-2.07,0.7c-0.939,0.717-1.439,1.871-1.322,3.047
c1.129,11.332,5.605,22.481,13.688,34.091c7.596,10.914,17.503,21.017,27.082,30.786c17.65,17.994,34.323,34.997,35.787,54.713
c0.131,1.779,1.613,3.158,3.399,3.158h20.737c0.934,0,1.826-0.384,2.471-1.061c0.642-0.677,0.981-1.584,0.935-2.519
c-0.184-3.713-0.723-7.428-1.596-11.16l0.008-0.008c-0.026-0.109-0.045-0.22-0.045-0.335c0-0.757,0.586-1.382,1.355-1.382
c0.065,0,0.129,0.012,0.193,0.021l0.001-0.001c16.929,2.48,27.635,6.438,27.651,10.8c0,0.003,0,0.006,0,0.01
c0,4.107-9.625,10.311-25.268,14.852l-0.006,0.006c-1.391,0.396-2.405,1.654-2.405,3.146c0,1.809,1.493,3.279,3.34,3.279
c0.255,0,0.501-0.029,0.739-0.083c21.027-4.864,34.966-13.038,34.966-22.266C173.899,211.998,155.055,202.211,126.997,197.8z"/>
<path class="st0" d="M71.392,187.112c-0.425-0.444-1.277-1.038-2.422-1.038c-1.547,0-2.466,0.999-2.812,1.529
c-2.264,3.445-4.24,6.844-5.946,10.209c-28.019,4.418-46.83,14.195-46.83,25.144c0,9.237,13.84,17.394,34.905,22.255
c0.003,0.001,0.023-0.001,0.031-0.002c0.248,0.059,0.503,0.096,0.769,0.096c1.846,0,3.339-1.471,3.339-3.279
c0-1.488-1.016-2.73-2.399-3.131l-0.011-0.022c-15.644-4.541-25.268-10.744-25.268-14.852c0-0.004,0-0.007,0-0.01
c0.016-4.354,10.692-8.307,27.58-10.788c0.061-0.01,0.119-0.02,0.181-0.02c0.776,0,1.369,0.632,1.369,1.396
c0,0.117-0.019,0.229-0.046,0.338l0.014,0.015c-0.867,3.716-1.398,7.415-1.581,11.111c-0.046,0.928,0.296,1.851,0.94,2.529
c0.643,0.674,1.548,1.062,2.479,1.062h20.738c1.781,0,3.281-1.394,3.412-3.17c0.451-6.067,2.348-12.149,5.786-18.54
c1.191-2.211,0.266-4.288-0.421-5.176C81.787,198.332,77.608,193.6,71.392,187.112z"/>
<path class="st0" d="M91.25,135.884c0.82,0.798,1.749,0.947,2.389,0.947h0.007c0.642,0,1.57-0.149,2.391-0.947
c7.312-7.11,11.241-15.4,12.102-17.705c0.126-0.339,0.253-0.723,0.253-1.26c0-1.84-1.533-3.154-3.137-3.154
c-1.324,0-5.094,0.391-11.591,0.391h-0.043c-6.496,0-10.265-0.391-11.588-0.391c-1.604,0-3.139,1.314-3.139,3.154
c0,0.537,0.127,0.921,0.254,1.26C80.007,120.483,83.937,128.773,91.25,135.884z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

@ -0,0 +1,5 @@
name: Confluence
description: |
Create, organize, and discuss work with your team
version: 5.10.6
category: Collaboration

View File

@ -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)

View File

@ -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'

View File

@ -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"

View File

@ -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.

View File

@ -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 <jan@rancher.com>"
license: The MIT License

View File

@ -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

View File

@ -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"

View File

@ -43,6 +43,8 @@ However it will not match
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

View File

@ -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 <s.shipway@auckland.ac.nz>

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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}

View File

@ -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}"

View File

@ -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

View File

@ -7,6 +7,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:
An instance of Secrets Bridge server running.

View File

@ -1,5 +1,5 @@
secrets-bridge:
image: rancher/secrets-bridge:v0.0.3
image: rancher/secrets-bridge:v0.1.7
command: agent --bridge-url ${BRIDGE_URL}
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View File

@ -1,55 +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.
#### 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.
#### Setup
See [setup guide](https://github.com/rancher/secrets-bridge/blob/master/docs/setup.md)

View File

@ -1,5 +1,5 @@
secrets-bridge:
image: rancher/secrets-bridge:v0.0.3
image: rancher/secrets-bridge:v0.1.7
environment:
CATTLE_ACCESS_KEY: ${CATTLE_ACCESS_KEY}
CATTLE_SECRET_KEY: ${CATTLE_SECRET_KEY}
@ -16,3 +16,9 @@ secrets-bridge:
- ${CATTLE_SECRET_KEY}
- --rancher-access
- ${CATTLE_ACCESS_KEY}
secrets-bridge-lb:
ports:
- "${LBPORT}:8181"
image: rancher/load-balancer-service
links:
- secrets-bridge:secrets-bridge

View File

@ -34,3 +34,18 @@
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"
label: "LB Port"
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