flywithu/community-catalog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix missing DRONE_HOST env; expose server ports; fix agent image ref; fix drone server address.

Browse Source
This commit is contained in:
Chris Fordham 2017-07-21 12:51:04 +10:00
parent 83ae433b17
commit c2f3e7a126
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/drone/4/docker-compose.yml.tpl
View File

@ -29,6 +29,7 @@ services:
server: server:
image: ${drone_server_image} image: ${drone_server_image}
environment: environment:
DRONE_HOST: drone
GIN_MODE: ${gin_mode} GIN_MODE: ${gin_mode}
{{- if (.Values.drone_debug)}} {{- if (.Values.drone_debug)}}
DRONE_DEBUG: '${drone_debug}' DRONE_DEBUG: '${drone_debug}'
@ -106,6 +107,9 @@ services:
io.rancher.scheduler.affinity:container_label_soft_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name} io.rancher.scheduler.affinity:container_label_soft_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
io.rancher.container.hostname_override: container_name io.rancher.container.hostname_override: container_name
{{- end}} {{- end}}
ports:
- 9000/tcp
- 8000/tcp
lb: lb:
image: rancher/load-balancer-service image: rancher/load-balancer-service
ports: ports:

12
templates/drone/4/rancher-compose.yml
View File

@ -66,12 +66,12 @@ catalog:
- Bitbucket Cloud - Bitbucket Cloud
- Bitbucket Server - Bitbucket Server
- variable: drone_driver_client - variable: drone_driver_client
label: Remote Driver client label: Remote Driver Client
description: "Client key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab." description: "Client key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab."
type: string type: string
required: false required: false
- variable: drone_driver_secret - variable: drone_driver_secret
label: Remote Driver secret label: Remote Driver Secret
description: "Secret key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab." description: "Secret key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab."
type: multiline type: multiline
required: false required: false
@ -81,12 +81,12 @@ catalog:
type: string type: string
required: false required: false
- variable: drone_driver_user - variable: drone_driver_user
label: Remove Driver Username label: Remote Driver Username
description: "Remote Driver username. Required for BitBucket Server; see http://docs.drone.io/install-for-bitbucket-server/." description: "Remote Driver username. Required for BitBucket Server; see http://docs.drone.io/install-for-bitbucket-server/."
type: string type: string
required: false required: false
- variable: drone_driver_password - variable: drone_driver_password
label: Remove Driver Password label: Remote Driver Password
description: "Remote Driver password. Required for BitBucket Server, http://docs.drone.io/install-for-bitbucket-server/." description: "Remote Driver password. Required for BitBucket Server, http://docs.drone.io/install-for-bitbucket-server/."
type: password type: password
required: false required: false
@ -94,7 +94,7 @@ catalog:
label: Drone Server label: Drone Server
description: "Drone sever identifier. Used by the agent to connect to the server (does not require change)." description: "Drone sever identifier. Used by the agent to connect to the server (does not require change)."
type: string type: string
default: "ws://drone:8000/ws/broker" default: "drone:9000"
- variable: drone_server_image - variable: drone_server_image
label: Drone Server Image label: Drone Server Image
description: "Docker image used for the Drone server container." description: "Docker image used for the Drone server container."
@ -104,7 +104,7 @@ catalog:
label: Drone Agent Image label: Drone Agent Image
description: "Docker image used for the Drone agent container(s)." description: "Docker image used for the Drone agent container(s)."
type: string type: string
default: "drone/drone:0.8.0-rc.1" default: "drone/agent:0.8.0-rc.1"
- variable: database_driver - variable: database_driver
label: Database Driver label: Database Driver
description: "Database driver. If sqlite, additional volume would be mounted at /var/lib/drone." description: "Database driver. If sqlite, additional volume would be mounted at /var/lib/drone."