wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

docker: remove daemon.json configuration

Browse source 
Fixes: #19202 (Latest docker update causes issues on btrfs)
Signed-off-by: Joseph Benden <joe@benden.us>
This commit is contained in:
Joseph Benden 2020-02-16 21:48:23 -07:00 • committed by Juan RP
parent e3861f0ba9
commit 6c3f4dbb2f
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/docker/files/daemon.json
View file

@ -1,5 +0,0 @@
{
"log-driver": "local",
"storage-driver": "overlay2",
"dns": ["8.8.8.8", "8.8.4.4"]
}

2
srcpkgs/docker/files/docker/log/run
View file

@ -1,2 +0,0 @@
#!/bin/sh
exec logger -t docker

1
srcpkgs/docker/files/docker/log/run Symbolic link
View file

@ -0,0 +1 @@
/usr/bin/vlogger

5
srcpkgs/docker/template
View file

@ -1,8 +1,7 @@
# Template file for 'docker' # Template file for 'docker'
pkgname=docker pkgname=docker
version=19.03.6 version=19.03.6
revision=1 revision=2
conf_files="/etc/docker/daemon.json"
wrksrc="${pkgname}-ce-${version}" wrksrc="${pkgname}-ce-${version}"
hostmakedepends="git go pkg-config curl cmake tar" hostmakedepends="git go pkg-config curl cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
@ -51,8 +50,6 @@ pre_build() {
} }
do_install() { do_install() {
vmkdir etc/docker
vinstall ${FILESDIR}/daemon.json 640 etc/docker daemon.json
vbin components/engine/bundles/dynbinary-daemon/dockerd dockerd vbin components/engine/bundles/dynbinary-daemon/dockerd dockerd
vbin components/cli/build/docker docker vbin components/cli/build/docker docker
vinstall components/cli/contrib/completion/bash/docker 644 usr/share/bash-completion/completions vinstall components/cli/contrib/completion/bash/docker 644 usr/share/bash-completion/completions