diff --git a/docker.spec b/docker.spec index 355991a..a84af2c 100644 --- a/docker.spec +++ b/docker.spec @@ -5,13 +5,13 @@ Name: docker Version: 19.03.15 -Release: 1mamba +Release: 2mamba Summary: An open-source application container engine Group: System/Servers Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.docker.com/ +URL: https://www.docker.com/ Source: https://github.com/docker/docker-ce.git/v%{version}/docker-ce-%{version}.tar.bz2 #Source1: https://github.com/opencontainers/runc.git/%{runc_tag}/runc-%{version}.tar.bz2 #Source2: https://github.com/containerd/containerd.git/%{containerd_tag}/containerd-%{version}.tar.bz2 @@ -22,7 +22,6 @@ Patch0: docker-1.9.1-build-missing-flags.patch License: Apache License 2.0 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libdevmapper-devel BuildRequires: libseccomp-devel BuildRequires: libsystemd-devel @@ -33,7 +32,6 @@ BuildRequires: gcc-go %systemd_requires Requires: containerd Requires: runc -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description An open-source application container engine. @@ -69,6 +67,9 @@ srcdir=`pwd` export GOPATH="$srcdir" export PATH="$GOPATH/bin:$PATH" +# Required since Go 1.16 +export GO111MODULE=off + ### cli _fake_gopath_pushd components/cli github.com/docker/cli DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version}-ce dynbinary @@ -108,6 +109,11 @@ _fake_gopath_popd srcdir=`pwd` +### proxy +install -Dm755 libnetwork/proxy %{buildroot}%{_bindir}/docker-proxy +### init +install -Dm755 tini/tini-static %{buildroot}%{_bindir}/docker-init + ### engine cd $srcdir/components/engine # binary @@ -175,6 +181,8 @@ fi %{_bindir}/docker %{_bindir}/docker-containerd-ctr %{_bindir}/docker-containerd-shim +%{_bindir}/docker-init +%{_bindir}/docker-proxy %{_bindir}/docker-runc %{_bindir}/docker-containerd %{_bindir}/dockerd @@ -193,6 +201,9 @@ fi %doc components/engine/AUTHORS components/engine/LICENSE %changelog +* Wed Aug 04 2021 Silvan Calarco 19.03.15-2mamba +- install docker-proxy and docker-init + * Tue Feb 02 2021 Automatic Build System 19.03.15-1mamba - automatic version update by autodist