From a81d48e703f84c75b92369114d51751fb8d3d738 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Mon, 19 Dec 2016 02:44:16 +0000 Subject: Switch Ubuntu to overlay2 docker driver With 4.4 kernel we can use the improved overlay2 driver instead of btrfs for significantly better performance when creating layers. Change-Id: I3b0dfd6db5298dfb34ec160eed910ca76feeb423 --- tools/setup_Debian.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 2ea203969..deb645bd4 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -57,11 +57,12 @@ source /etc/lsb-release echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list add_key sudo apt-get update -sudo apt-get -y install --no-install-recommends docker-engine btrfs-tools +sudo apt-get -y install --no-install-recommends docker-engine sudo service docker stop -setup_disk if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then + sudo apt-get -y install --no-install-recommends btrfs-tools + setup_disk echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker sudo mount --make-shared /run sudo service docker start @@ -70,7 +71,7 @@ else sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF [Service] ExecStart= -ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000 +ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry=127.0.0.1:4000 MountFlags=shared EOF sudo systemctl daemon-reload -- cgit v1.2.3