From d77f6189cfabdb8e55b9c32e473c7fefc17f6b42 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 9 Mar 2019 04:50:39 -0300 Subject: [PATCH] docker: don't build containerd and runc, depend on pkgs that provide it closes #4967 --- srcpkgs/docker/template | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 6f215b30bc9..88d227243a3 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,10 +1,12 @@ # Template file for 'docker' pkgname=docker version=18.09.3 -revision=1 +revision=2 wrksrc="${pkgname}-ce-${version}" hostmakedepends="git go pkg-config curl cmake" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel libltdl-devel" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel + libapparmor-devel libltdl-devel" +depends="containerd runc" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" @@ -13,14 +15,14 @@ distfiles="https://github.com/docker/docker-ce/archive/v${version}.tar.gz" checksum=28d01bbbba45b289027e963d0a5dc830a81b5dab9339a950a4c2505e1ee9a255 # These are required at run-time. -depends="iptables xz git" +depends+=" iptables xz git" nopie=yes nostrip=yes nocross=yes archs="x86_64* ppc64le*" system_groups="docker" -_docker_components="runc containerd tini proxy dockercli" +_docker_components="tini proxy dockercli" do_build() { cd components/cli @@ -48,9 +50,12 @@ pre_build() { } do_install() { - vbin ${wrksrc}/components/engine/bundles/dynbinary-daemon/dockerd dockerd - vbin ${wrksrc}/components/cli/build/docker docker - vinstall ${wrksrc}/components/cli/contrib/completion/bash/docker 644 usr/share/bash-completion/completions - vinstall ${wrksrc}/components/cli/contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions + 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 + vinstall components/cli/contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions + vinstall components/cli/contrib/completion/fish/docker.fish 644 usr/share/fish_vendor_completions.d/docker.fish + vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 usr/share/vim/vimfiles/snytax/dockerfile.vim + vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 usr/share/vim/vimfiles/ftdetect/dockerfile.vim vsv docker }