automatic version update by autodist [release 19.03.14-1mamba;Wed Dec 02 2020]

This commit is contained in:
Automatic Build System 2024-01-05 21:52:10 +01:00
parent f8f431a8c6
commit ba499f202a

View File

@ -1,12 +1,10 @@
%define groupid 65440 %define groupid 65440
%define userid 65440 %define userid 65440
%define runc_tag v1.0.0-rc5 %define libnetwork_tag master@3eb39382bfa6a3c42f83674ab080ae13b0e34e5d
%define containerd_tag v1.0.3 %define tini_tag v0.18.0@fec3683b971d9c3ef73f284f176672c44b448662
%define libnetwork_tag master
%define tini_tag v0.13.0
Name: docker Name: docker
Version: 18.05.0 Version: 19.03.14
Release: 1mamba Release: 1mamba
Summary: An open-source application container engine Summary: An open-source application container engine
Group: System/Servers Group: System/Servers
@ -14,23 +12,24 @@ Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.docker.com/ URL: http://www.docker.com/
Source: https://github.com/docker/docker-ce.git/v%{version}-ce/docker-ce-%{version}.tar.bz2 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 #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 #Source2: https://github.com/containerd/containerd.git/%{containerd_tag}/containerd-%{version}.tar.bz2
Source3: https://github.com/docker/libnetwork.git/%{libnetwork_tag}/libnetwork-%{version}.tar.bz2 Source3: https://github.com/docker/libnetwork.git/%{libnetwork_tag}/libnetwork-%{version}.tar.bz2
Source4: https://github.com/krallin/tini.git/%{tini_tag}/tini-%{version}.tar.bz2 Source4: https://github.com/krallin/tini.git/%{tini_tag}/tini-%{version}.tar.bz2
Source5: https://github.com/spf13/cobra.git/master/cobra-%{version}.tar.bz2
Patch0: docker-1.9.1-build-missing-flags.patch Patch0: docker-1.9.1-build-missing-flags.patch
License: Apache License 2.0 License: Apache License 2.0
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libdevmapper-devel BuildRequires: libdevmapper-devel
BuildRequires: libltdl-devel
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: libsystemd-devel BuildRequires: libsystemd-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libgo-devel >= 7.3.0-1mamba BuildRequires: libgo-devel >= 7.3.0-1mamba
BuildRequires: go-md2man BuildRequires: go-md2man
BuildRequires: go BuildRequires: gcc-go
%systemd_requires %systemd_requires
Requires: containerd Requires: containerd
Requires: runc Requires: runc
@ -42,13 +41,14 @@ An open-source application container engine.
%debug_package %debug_package
%prep %prep
%setup -q -n docker-ce-%{version} -a1 -a2 -a3 -a4 %setup -q -n docker-ce-%{version} -a3 -a4 -a5
#%patch0 -p1 #%patch0 -p1
mv containerd-%{version} containerd
mv runc-%{version} runc
mv libnetwork-%{version} libnetwork mv libnetwork-%{version} libnetwork
mv tini-%{version} tini mv tini-%{version} tini
mv cobra-%{version} cobra
sed -i 's,/var/run,/run,' components/engine/contrib/init/systemd/docker.socket
%build %build
# create a fake go path directory and pushd into it # create a fake go path directory and pushd into it
# $1 real directory # $1 real directory
@ -77,7 +77,7 @@ _fake_gopath_popd
### daemon ### daemon
_fake_gopath_pushd components/engine github.com/docker/docker _fake_gopath_pushd components/engine github.com/docker/docker
DOCKER_GITCOMMIT=v%{version} \ DOCKER_GITCOMMIT=v%{version} \
DOCKER_BUILDTAGS='seccomp journald' \ DOCKER_BUILDTAGS='seccomp journald apparmor' \
VERSION=%{version}-ce \ VERSION=%{version}-ce \
hack/make.sh dynbinary hack/make.sh dynbinary
_fake_gopath_popd _fake_gopath_popd
@ -87,17 +87,8 @@ mkdir -p src/github.com/spf13
ln -rsfT cobra src/github.com/spf13/cobra ln -rsfT cobra src/github.com/spf13/cobra
# use docker-ce cli version because they mess up with man dir # use docker-ce cli version because they mess up with man dir
_fake_gopath_pushd components/cli github.com/docker/cli _fake_gopath_pushd components/cli github.com/docker/cli
make manpages 2>/dev/null make manpages
_fake_gopath_popd #2>/dev/null
### runc
_fake_gopath_pushd runc github.com/opencontainers/runc
make BUILDTAGS='seccomp'
_fake_gopath_popd
### containerd
_fake_gopath_pushd containerd github.com/containerd/containerd
make
_fake_gopath_popd _fake_gopath_popd
### docker proxy ### docker proxy
@ -117,18 +108,10 @@ _fake_gopath_popd
srcdir=`pwd` srcdir=`pwd`
### runc
install -Dm755 runc/runc %{buildroot}%{_bindir}/docker-runc
### containerd
install -Dm755 containerd/bin/containerd %{buildroot}%{_bindir}/docker-containerd
install -Dm755 containerd/bin/containerd-shim \
%{buildroot}%{_bindir}/docker-containerd-shim
install -Dm755 containerd/bin/ctr %{buildroot}%{_bindir}/docker-containerd-ctr
### engine ### engine
cd $srcdir/components/engine cd $srcdir/components/engine
# binary # binary
install -Dm755 {bundles/latest/dynbinary-daemon,%{buildroot}%{_bindir}}/dockerd install -Dm755 {bundles/dynbinary-daemon,%{buildroot}%{_bindir}}/dockerd
# systemd # systemd
install -Dm644 'contrib/init/systemd/docker.service' \ install -Dm644 'contrib/init/systemd/docker.service' \
%{buildroot}%{_unitdir}/docker.service %{buildroot}%{_unitdir}/docker.service
@ -158,11 +141,11 @@ install -Dm644 'contrib/completion/fish/docker.fish' \
install -dm755 %{buildroot}%{_mandir} install -dm755 %{buildroot}%{_mandir}
cp -r man/man* %{buildroot}%{_mandir}/ cp -r man/man* %{buildroot}%{_mandir}/
## symlink containerd/run (nice integration...) # symlink containerd/run
#ln -s containerd %{buildroot}%{_bindir}/docker-containerd ln -s containerd %{buildroot}%{_bindir}/docker-containerd
#ln -s containerd-shim %{buildroot}%{_bindir}/docker-containerd-shim ln -s containerd-shim %{buildroot}%{_bindir}/docker-containerd-shim
#ln -s ctr %{buildroot}%{_bindir}/docker-containerd-ctr ln -s ctr %{buildroot}%{_bindir}/docker-containerd-ctr
#ln -s runc %{buildroot}%{_bindir}/docker-runc ln -s runc %{buildroot}%{_bindir}/docker-runc
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -210,6 +193,18 @@ fi
%doc components/engine/AUTHORS components/engine/LICENSE %doc components/engine/AUTHORS components/engine/LICENSE
%changelog %changelog
* Wed Dec 02 2020 Automatic Build System <autodist@mambasoft.it> 19.03.14-1mamba
- automatic version update by autodist
* Fri Sep 18 2020 Automatic Build System <autodist@mambasoft.it> 19.03.13-1mamba
- automatic version update by autodist
* Tue Sep 01 2020 Automatic Build System <autodist@mambasoft.it> 19.03.12-1mamba
- automatic version update by autodist
* Tue May 12 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 19.03.8-1mamba
- update to 19.03.8
* Sun Jul 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.05.0-1mamba * Sun Jul 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.05.0-1mamba
- update to 18.05.0 - update to 18.05.0