PR#3: Switch to `auto` driver by default - rpms/docker

Colin Walters • 6 years ago

e833fa8

docker.spec

file modified

+6 -2

		`@@ -12,6 +12,8 @@`
		`%global __os_install_post %{_rpmconfigdir}/brp-compress`

		`# default overlay2 storage only on Fedora 26 and later`
		`+ # TODO: Delete all of this after F26 is EOL, in F27+ everything`
		`+ # is identical across editions`
		`%if 0%{?fedora} >= 26 \|\| 0%{?rhel} > 7`
		`%global custom_storage 1`
		`%else`
		`@@ -526,7 +528,9 @@`
		`# here keep the new line above otherwise autosetup fails when applying patch`
		`cp %{SOURCE9} .`

		`- # untar d-s-s`
		+ # Unpack container-storage-setup; we use the `make install-docker` target
		`+ # from upstream which installs compatibility symlinks. However, this package`
		+ # contains the default storage configuration, which is now `auto`.
		`tar zxf %{SOURCE1}`
		`pushd container-storage-setup-%{commit_dss}`
		`%if %{custom_storage}`
		`@@ -534,7 +538,7 @@`
		`ln -s %{repo}-storage-setup-override.conf %{repo}-storage-setup-default`
		`# create workstation override config`
		`cp %{repo}-storage-setup-override.conf %{repo}-storage-setup-workstation`
		`- echo 'STORAGE_DRIVER=overlay2' >> %{repo}-storage-setup-workstation`
		`+ echo 'STORAGE_DRIVER=auto' >> %{repo}-storage-setup-workstation`
		`# create cloud override config`
		`ln -s %{repo}-storage-setup-workstation %{repo}-storage-setup-cloud`
		`# create server override config`