Skip to content

Commit b0184e5

Browse files
committed
Merge pull request #1202 from deis/builder-storage-driver-opt
fix(builder): allow filesystems other than btrfs
2 parents 195d9c6 + 93e5797 commit b0184e5

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

builder/bin/boot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export ETCD_PORT=${ETCD_PORT:-4001}
1414
export ETCD="$HOST:$ETCD_PORT"
1515
export ETCD_PATH=${ETCD_PATH:-/deis/builder}
1616
export ETCD_TTL=${ETCD_TTL:-10}
17+
export STORAGE_DRIVER=${STORAGE_DRIVER:-btrfs}
1718

1819
# wait for etcd to be available
1920
until etcdctl --no-sync -C $ETCD ls >/dev/null; do
@@ -44,7 +45,7 @@ CONFD_PID=$!
4445
test -e /var/run/docker.sock && rm -f /var/run/docker.sock
4546

4647
# spawn a docker daemon to run builds
47-
docker -d --storage-driver=btrfs --bip=172.19.42.1/16 &
48+
docker -d --storage-driver=$STORAGE_DRIVER --bip=172.19.42.1/16 &
4849
DOCKER_PID=$!
4950

5051
# wait for docker to start

0 commit comments

Comments
 (0)