docker: remove daemon.json configuration

Fixes: void-linux#19202 (Latest docker update causes issues on btrfs) Signed-off-by: Joseph Benden <joe@benden.us>
jbenden · Feb 17, 2020 · 214663b · 214663b
1 parent e3861f0
commit 214663b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/srcpkgs/docker/files/daemon.json b/srcpkgs/docker/files/daemon.json
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
@@ -1,8 +1,7 @@
 # Template file for 'docker'
 pkgname=docker
 version=19.03.6
-revision=1
-conf_files="/etc/docker/daemon.json"
+revision=2
 wrksrc="${pkgname}-ce-${version}"
 hostmakedepends="git go pkg-config curl cmake tar"
 makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
@@ -51,8 +50,6 @@ pre_build() {
 }
 
 do_install() {
-	vmkdir etc/docker
-	vinstall ${FILESDIR}/daemon.json 640 etc/docker daemon.json
 	vbin components/engine/bundles/dynbinary-daemon/dockerd dockerd
 	vbin components/cli/build/docker docker
 	vinstall components/cli/contrib/completion/bash/docker 644 usr/share/bash-completion/completions