Merge branch 'maint-2.0'
8b7d6a34f41e
Actions

Authored by kuncar on Jun 2 2015, 13:21.

Description

Merge branch 'maint-2.0'

maint-2.0: docker: exposure on non-reserverd ports docker: better boot procedure docker: volumes in Dockerfile docker: boot master autodetection

Committed

kuncar

Jun 2 2015, 13:21

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:8b7d6a34f41e: Merge branch 'maint-2.0' (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 2 2015, 13:21

Commit	Author	Details	Committed
69e1ee66a10f	Marco Neumann	docker: exposure on non-reserverd ports	Jun 2 2015
9e5cb5bfcdfb	Marco Neumann	docker: better boot procedure	Jun 2 2015
b256d60c936d	Marco Neumann	docker: volumes in Dockerfile	Jun 2 2015
5c2da28c5aba	Marco Neumann	docker: boot master autodetection	Jun 2 2015

				Path
	M			Dockerfile
	M			docker-compose-dev.yml
	M			docker-compose.yml
	M			docs/_static/docker-compose-setup.plantuml
	D			docs/_static/docker-compose-setup.png
	A			docs/_static/docker-compose-setup.svg
	M			docs/developers/docker.rst
	A			scripts/docker_boot.sh
	D			scripts/docker_devboot.sh
	M			scripts/setup_devmode.sh