snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions 1 Activity

Revert "docker: Use OPTS="-s=overlay2" in case OPTS is not set" 

This reverts commit 5c212702ef.

Closes #21254
This commit is contained in:
Piraty 2020-05-02 00:21:23 +02:00
parent 334b376335
commit 7e4ec0a6a9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/docker/files/docker/run
View File

@ -5,5 +5,4 @@ mountpoint -q /sys/fs/cgroup/systemd || {
mkdir -p /sys/fs/cgroup/systemd; mkdir -p /sys/fs/cgroup/systemd;
mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd; mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
} }
[ -n "$OPTS" ] || OPTS="-s=overlay2"
exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1 exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1

4
srcpkgs/docker/template
View File

@ -1,7 +1,7 @@
# Template file for 'docker' # Template file for 'docker'
pkgname=docker pkgname=docker
version=19.03.8 version=19.03.8
revision=1 revision=2
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
@ -42,7 +42,7 @@ do_build() {
pre_build() { pre_build() {
cd components/engine cd components/engine
vmkdir usr/bin vmkdir usr/bin
sed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh vsed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh
for COMPONENT in $_docker_components; do for COMPONENT in $_docker_components; do
AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v${version} \ AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v${version} \
hack/dockerfile/install/install.sh $COMPONENT hack/dockerfile/install/install.sh $COMPONENT