D2838.id7239.diff
No OneTemporary
Actions

Size

972 B

Referenced Files

None

Subscribers

None

D2838.id7239.diff
View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -308,6 +308,7 @@
	aliases:
	- build.nasqueron.org
	jenkins_url: https://ci.nasqueron.org
	+ jenkins_multi_branch: True

	tommy_cd:
	# No host definition, as this dashboard is mounted on infra.nasqueron.org
	diff --git a/roles/paas-docker/containers/tommy.sls b/roles/paas-docker/containers/tommy.sls
	--- a/roles/paas-docker/containers/tommy.sls
	+++ b/roles/paas-docker/containers/tommy.sls
	@@ -21,6 +21,10 @@
	- image: nasqueron/tommy
	- environment:
	- JENKINS_URL: {{ container['jenkins_url'] }}
	+ {% if "jenkins_multi_branch" in container %}
	+ # We don't use default value, as Ruby idea of truthy is pretty large, including 0
	+ - JENKINS_MULTI_BRANCH: {{ container['jenkins_multi_branch'] }}
	+ {% endif %}
	- ports:
	- 4567
	- port_bindings: