diff --git a/srcpkgs/docker/files/daemon.json b/srcpkgs/docker/files/daemon.json deleted file mode 100644 index 495ed32fbae..00000000000 --- a/srcpkgs/docker/files/daemon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "log-driver": "local", - "storage-driver": "overlay2", - "dns": ["8.8.8.8", "8.8.4.4"] -} diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run deleted file mode 100755 index 4c6ff2c7769..00000000000 --- a/srcpkgs/docker/files/docker/log/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec logger -t docker diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run new file mode 120000 index 00000000000..3a5b4a58605 --- /dev/null +++ b/srcpkgs/docker/files/docker/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 3a9fc98be1f..8ce2efeba18 100644 --- 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