Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Add support for different docker directory #10

Merged
merged 1 commit into from
Jun 2, 2016
Merged

Conversation

ltsampros
Copy link
Contributor

Add support for different docker directory

@@ -4,7 +4,11 @@
#DOCKER="/usr/local/bin/docker"

# Use DOCKER_OPTS to modify the daemon startup options.
#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
{% if docker.datadir %}
DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4 -g {{ docker.datadir }}"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets leave the DNS as optional still (leave it commented) and add another line for -g

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@filipposc5
Copy link

We did this before in the past[1], so I am happy to do it again. 👍 from me

[1]: /usr/bin/docker -d -s btrfs -g /mnt/docker --insecure-registry docker.local:5000

@ltsampros ltsampros force-pushed the data-docker-directory branch from bd256c3 to d66791d Compare June 1, 2016 13:17
@ltsampros ltsampros changed the title [WIP] Add support for different docker directory Add support for different docker directory Jun 1, 2016
@ltsampros ltsampros force-pushed the data-docker-directory branch from d66791d to 8e58d01 Compare June 1, 2016 17:41
# Docker Upstart and SysVinit configuration file

# Customize location of Docker binary (especially for development testing).
#DOCKER="/usr/local/bin/docker"

# Use DOCKER_OPTS to modify the daemon startup options.
#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
{% if docker.datadir %}
DOCKER_OPTS="-g {{ docker.datadir }}"
Copy link
Contributor

@mattpep mattpep Jun 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better append (to the currently empty) variable in case the line above is ever uncommented?

i.e. the line would be

DOCKER_OPTS="${DOCKER_OPTS} -g {{ docker.datadir }}"

It would mean that a change to the DNS options would result in a 1-line diff rather than something larger.

@ltsampros ltsampros force-pushed the data-docker-directory branch from 8e58d01 to 77d1dc5 Compare June 2, 2016 16:27
@mattpep mattpep merged commit 73f4c1c into master Jun 2, 2016
@mattpep mattpep deleted the data-docker-directory branch June 2, 2016 16:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants