Merge pull request #488 from disaster37/feature/gocd2
Update GoCD template
This commit is contained in:
commit
2d87dd7111
@ -5,7 +5,7 @@ services:
|
|||||||
tty: true
|
tty: true
|
||||||
image: webcenter/alpine-gocd-server:17.3.0-1
|
image: webcenter/alpine-gocd-server:17.3.0-1
|
||||||
volumes:
|
volumes:
|
||||||
{{- if (contains .Values.VOLUME_DRIVER_SERVER "/")}}
|
{{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_SERVER) "/" }}
|
||||||
- ${VOLUME_DRIVER_SERVER}:/data
|
- ${VOLUME_DRIVER_SERVER}:/data
|
||||||
{{- else}}
|
{{- else}}
|
||||||
- gocd-server-data:/data
|
- gocd-server-data:/data
|
||||||
@ -36,7 +36,7 @@ services:
|
|||||||
- GOCD_PLUGIN_google-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/google-oauth-login-2.3.jar
|
- GOCD_PLUGIN_google-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/google-oauth-login-2.3.jar
|
||||||
- GOCD_PLUGIN_github-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/github-oauth-login-2.3.jar
|
- GOCD_PLUGIN_github-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/github-oauth-login-2.3.jar
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if (ne .Values.DEPLOY_LB "true") and .Values.PUBLISH_PORT}}
|
{{- if and (ne .Values.DEPLOY_LB "true") (.Values.PUBLISH_PORT)}}
|
||||||
ports:
|
ports:
|
||||||
- ${PUBLISH_PORT}:8153
|
- ${PUBLISH_PORT}:8153
|
||||||
{{- end}}
|
{{- end}}
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
{{- if eq .Values.DEPLOY_LB "true"}}
|
{{- if eq .Values.DEPLOY_LB "true"}}
|
||||||
lb:
|
lb:
|
||||||
image: rancher/lb-service-haproxy:v0.6.2
|
image: rancher/lb-service-haproxy:v0.6.2
|
||||||
{{- if .Values.PUBLISH_PORT}}
|
{{- if (.Values.PUBLISH_PORT)}}
|
||||||
ports:
|
ports:
|
||||||
- ${PUBLISH_PORT}:8153/tcp
|
- ${PUBLISH_PORT}:8153/tcp
|
||||||
{{- else}}
|
{{- else}}
|
||||||
@ -65,7 +65,7 @@ services:
|
|||||||
tty: true
|
tty: true
|
||||||
image: webcenter/alpine-gocd-agent:17.3.0-1
|
image: webcenter/alpine-gocd-agent:17.3.0-1
|
||||||
volumes:
|
volumes:
|
||||||
{{- if (contains .Values.VOLUME_DRIVER_AGENT "/")}}
|
{{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
|
||||||
- ${VOLUME_DRIVER_AGENT}:/data
|
- ${VOLUME_DRIVER_AGENT}:/data
|
||||||
{{- else}}
|
{{- else}}
|
||||||
- gocd-agent-data:/data
|
- gocd-agent-data:/data
|
||||||
@ -102,7 +102,7 @@ services:
|
|||||||
io.rancher.container.hostname_override: container_name
|
io.rancher.container.hostname_override: container_name
|
||||||
image: index.docker.io/docker:1.13-dind
|
image: index.docker.io/docker:1.13-dind
|
||||||
volumes:
|
volumes:
|
||||||
{{- if (contains .Values.VOLUME_DRIVER_AGENT "/")}}
|
{{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
|
||||||
- ${VOLUME_DRIVER_AGENT}:/data
|
- ${VOLUME_DRIVER_AGENT}:/data
|
||||||
{{- else}}
|
{{- else}}
|
||||||
- gocd-agent-data:/data
|
- gocd-agent-data:/data
|
||||||
@ -114,12 +114,12 @@ volumes:
|
|||||||
gocd-scheduler-setting:
|
gocd-scheduler-setting:
|
||||||
driver: local
|
driver: local
|
||||||
per_container: true
|
per_container: true
|
||||||
{{- if not (contains .Values.VOLUME_DRIVER_AGENT "/")}}
|
{{- if ne (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
|
||||||
gocd-agent-data:
|
gocd-agent-data:
|
||||||
driver: ${VOLUME_DRIVER_AGENT}
|
driver: ${VOLUME_DRIVER_AGENT}
|
||||||
per_container: true
|
per_container: true
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if not (contains .Values.VOLUME_DRIVER_SERVER "/")}}
|
{{- if ne (printf "%.1s" .Values.VOLUME_DRIVER_SERVER) "/"}}
|
||||||
gocd-server-data:
|
gocd-server-data:
|
||||||
driver: ${VOLUME_DRIVER_SERVER}
|
driver: ${VOLUME_DRIVER_SERVER}
|
||||||
{{- end}}
|
{{- end}}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user