# TODO: drop P docker when docker-compose updated to use docker(engine) dep
# NOTES
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-
-# v1.0.0-rc2-391-g2d41c047
-%define runc_commit 2d41c04
-# v0.2.8-38-gcfb82a87
-%define containerd_commit cfb82a8
-# v0.8.0-dev.2-624-g7b2b1feb
-%define libnetwork_commit 7b2b1fe
-#define subver -rc1
+# - https://github.com/docker/docker-ce/releases
+# - https://github.com/moby/moby/blob/master/project/PACKAGERS.md#build-dependencies
+
+# v1.0.0-rc8
+%define runc_commit 425e105
+# v1.2.6
+%define containerd_commit 894b81a
+# v0.8.0-dev.2-1075-g1b91bc94
+%define libnetwork_commit fc5a7d9
+#define subver -rc2
Summary: Docker CE: the open-source application container engine
Name: docker-ce
# Using Docker-CE, Stay on Stable channel
# https://docs.docker.com/engine/installation/
-Version: 17.06.0
-Release: 0.1
+Version: 19.03.0
+Release: 1
License: Apache v2.0
Group: Applications/System
# https://github.com/docker/docker-ce/releases
-Source0: https://github.com/docker/docker-ce/archive/v%{version}-ce/%{name}-%{version}-ce.tar.gz
-# Source0-md5: 1eb7761b77dc328e6b0a9c481bcd7514
-Source1: https://github.com/docker/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
-# Source1-md5: b1b8584e23f1e0dbe5e1bd2e623262df
-Source2: https://github.com/docker/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz
-# Source2-md5: a07b23b82974bba8fb8dfa69234cbd6a
+#Source0: https://github.com/docker/docker-ce/archive/v%{version}-ce%{subver}/%{name}-%{version}-ce%{subver}.tar.gz
+Source0: https://github.com/docker/docker-ce/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 54ad698dab2cf2de536ed3342a5582d3
+Source1: https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
+# Source1-md5: 19cc68f9cb984d0ee796be183b767ff1
+Source2: https://github.com/containerd/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz
+# Source2-md5: 26f6af6a60850b1ff63a7d382049bfa0
Source3: https://github.com/docker/libnetwork/archive/%{libnetwork_commit}/libnetwork-%{libnetwork_commit}.tar.gz
-# Source3-md5: 9360e38c43e862e42c128db1852ac5bb
-Source4: https://github.com/krallin/tini/archive/v0.13.0/tini-0.13.0.tar.gz
-# Source4-md5: c29541112a242c53c82bb6b1213f288f
+# Source3-md5: dacd7bdb1d2a0a0f2365674614e57f8a
+Source4: https://github.com/krallin/tini/archive/v0.18.0/tini-0.18.0.tar.gz
+# Source4-md5: cc3b205a1b83b8e6ed6892fc5e8ef2c3
Source5: dockerd.sh
Source7: docker.init
Source8: docker.sysconfig
BuildRequires: btrfs-progs-devel >= 3.16.1
BuildRequires: cmake
BuildRequires: device-mapper-devel >= 2.02.89
-BuildRequires: golang >= 1.6
-BuildRequires: libseccomp-devel >= 2.2.1
+BuildRequires: golang >= 1.12
+BuildRequires: libseccomp-devel >= 2.3
BuildRequires: rpmbuild(macros) >= 1.644
BuildRequires: sqlite3-devel >= 3.7.9
+BuildRequires: xxd
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
Provides: docker = %{version}
Provides: docker(engine) = %{version}
Provides: group(docker)
-Obsoletes: docker < 17.0
+Requires: libseccomp >= 2.3
+Obsoletes: docker < 18.0
Obsoletes: lxc-docker < 1.1.1
# only runs on x64 hosts for now:
# https://github.com/docker/docker/issues/136
This plugin provides syntax highlighting in Dockerfile.
%prep
-%setup -q -n docker-ce-%{version}-ce%{?subver} -a1 -a2 -a3 -a4
-#mv runc-%{runc_commit}* runc
-#mv containerd-%{containerd_commit}* containerd
-#mv libnetwork-%{libnetwork_commit}* libnetwork
+%setup -q -n %{name}-%{version}%{?subver} -a1 -a2 -a3 -a4
+
+mv runc-%{runc_commit}* runc
+mv runc/vendor runc/src
+ln -s ../../.. runc/src/github.com/opencontainers/runc
+
+mv containerd-%{containerd_commit}* containerd
+mv containerd/vendor containerd/src
+ln -s ../../.. containerd/src/github.com/containerd/containerd
+
+mv libnetwork-%{libnetwork_commit}* libnetwork
+install -d libnetwork/gopath
+mv libnetwork/vendor libnetwork/gopath/src
+ln -s ../../../.. libnetwork/gopath/src/github.com/docker/libnetwork
+
mv tini-* tini
-%patch0 -p1 -d components/engine
-#install -d vendor/src/github.com/docker
-#ln -s $(pwd) vendor/src/github.com/docker/docker
-#ln -s $(pwd)/containerd containerd/vendor/src/github.com/docker/containerd
-#ln -s $(pwd)/libnetwork vendor/src/github.com/docker/libnetwork
+install -d components/cli/.gopath/src/github.com/docker
+ln -s ../../../.. components/cli/.gopath/src/github.com/docker/cli
-#ln -s ../../../../cli components/engine/vendor/github.com/docker
-#ln -s cli/vendor/github.com/docker/docker components/engine/vendor/github.com/docker
-#ln -s ../../.. components/engine/vendor/github.com/docker/docker
+%patch0 -p1 -d components/engine
%build
-v=$(awk -F= '/^RUNC_COMMIT/ {print $2}' components/engine/hack/dockerfile/binaries-commits)
-echo "$v" | grep "^%{runc_commit}"
-v=$(awk -F= '/^CONTAINERD_COMMIT/ {print $2}' components/engine/hack/dockerfile/binaries-commits)
-echo "$v" | grep "^%{containerd_commit}"
-v=$(awk -F= '/^LIBNETWORK_COMMIT/ {print $2}' components/engine/hack/dockerfile/binaries-commits)
-echo "$v" | grep "^%{libnetwork_commit}"
-
-#export GOPATH=$(pwd)/vendor:$(pwd)/containerd/vendor
-#export GOPATH=$(pwd)/components/engine
-export AUTO_GOPATH=1
-#export GOROOT=$(pwd)/components/engine
-export DOCKER_GITCOMMIT="pld/%{version}"
-# build docker-runc
-#%{__make} -C runc
-
-# build docker-containerd
-#%{__make} -C containerd
+grep -rhE "=%{runc_commit}|=%{containerd_commit}|=%{libnetwork_commit}" $(pwd)/components/engine/hack/dockerfile/install/
+
+export VERSION=%{version}-ce # for `docker version`
+export GITCOMMIT="PLD-Linux/%{version}" # for cli
+export DOCKER_GITCOMMIT="PLD-Linux/%{version}" # for engine
+
+# build runc
+sed -i -e 's,shell git,shell false,' runc/Makefile
+GOPATH=$(pwd)/runc \
+%{__make} -C runc \
+ COMMIT=$RUNC_COMMIT
+./runc/runc -v
+
+# build containerd
+GOPATH=$(pwd)/containerd \
+%{__make} -C containerd \
+ GIT_COMMIT=$CONTAINERD_COMMIT
# build docker-proxy
-#go build -ldflags="-linkmode=external" \
-# -o docker-proxy \
-# github.com/docker/libnetwork/cmd/proxy
+cd libnetwork
+GOPATH=$(pwd)/gopath \
+go build -ldflags="-linkmode=external" \
+ -o docker-proxy \
+ github.com/docker/libnetwork/cmd/proxy
+cd ..
# build docker-init
cd tini
cmake .
%{__make}
-cd ..
-cd components/engine
+# docker cli
+cd ../components/cli
+GOPATH=$(pwd)/.gopath \
+DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+%{__make} dynbinary
+./build/docker -v
+
+cd ../engine
+AUTO_GOPATH=1 \
bash -x hack/make.sh dynbinary
+./bundles/latest/dynbinary-daemon/dockerd -v
%if %{with doc}
man/md2man-all.sh
%endif
$RPM_BUILD_ROOT%{_libexecdir} \
$RPM_BUILD_ROOT/var/lib/docker/{containers,execdriver,graph,image,init,network,swarm,tmp,trust,vfs,volumes}
-install -p components/engine/bundles/latest/dynbinary-daemon/dockerd $RPM_BUILD_ROOT%{_sbindir}/dockerd
-install -p components/engine/bundles/latest/dynbinary-client/docker $RPM_BUILD_ROOT%{_bindir}/docker
+# docker-cli
+install -p components/cli/build/docker $RPM_BUILD_ROOT%{_bindir}/docker
-# install docker-runc
-install -p runc/runc $RPM_BUILD_ROOT%{_sbindir}/docker-runc
+# runc
+install -p runc/runc $RPM_BUILD_ROOT%{_sbindir}/runc
-# install docker-containerd
-install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/docker-containerd
-install -p containerd/bin/containerd-shim $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-shim
-install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr
+# containerd
+install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/containerd
+install -p containerd/bin/containerd-shim $RPM_BUILD_ROOT%{_sbindir}/containerd-shim
+install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/ctr
-# install docker-proxy
-install -p docker-proxy $RPM_BUILD_ROOT%{_sbindir}/docker-proxy
+# docker-proxy
+install -p libnetwork/docker-proxy $RPM_BUILD_ROOT%{_sbindir}/docker-proxy
-# install docker-init
+# docker-init
install -p tini/tini $RPM_BUILD_ROOT%{_sbindir}/docker-init
-cp -p components/engine/contrib/init/systemd/docker.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p components/engine/contrib/init/systemd/docker.socket $RPM_BUILD_ROOT%{systemdunitdir}
+# dockerd
+cd components/engine
+install -p bundles/latest/dynbinary-daemon/dockerd $RPM_BUILD_ROOT%{_sbindir}/dockerd
+cp -p contrib/init/systemd/docker.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p contrib/init/systemd/docker.socket $RPM_BUILD_ROOT%{systemdunitdir}
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
install -p %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/dockerd
cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker
install -d $RPM_BUILD_ROOT/lib/udev/rules.d
cp -p contrib/udev/80-docker.rules $RPM_BUILD_ROOT/lib/udev/rules.d
-# bash and zsh completion
-install -d $RPM_BUILD_ROOT%{bash_compdir}
-cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/docker
-install -d $RPM_BUILD_ROOT%{zsh_compdir}
-cp -p contrib/completion/zsh/_docker $RPM_BUILD_ROOT%{zsh_compdir}
-
# vim syntax
%if %{with vim}
install -d $RPM_BUILD_ROOT%{_vimdatadir}
%{__rm} $RPM_BUILD_ROOT%{_vimdatadir}/{LICENSE,README.md}
%endif
+# bash and zsh completion
+cd ../cli/contrib/completion
+install -d $RPM_BUILD_ROOT%{bash_compdir}
+cp -p bash/docker $RPM_BUILD_ROOT%{bash_compdir}
+install -d $RPM_BUILD_ROOT%{zsh_compdir}
+cp -p zsh/_docker $RPM_BUILD_ROOT%{zsh_compdir}
+
%pre
%groupadd -g 296 docker
%files
%defattr(644,root,root,755)
-%doc README.md CHANGELOG.md CONTRIBUTING.md LICENSE AUTHORS NOTICE MAINTAINERS
+%doc components/engine/{README.md,CHANGELOG.md,CONTRIBUTING.md,LICENSE,AUTHORS,NOTICE,MAINTAINERS}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/docker
%attr(754,root,root) /etc/rc.d/init.d/docker
%attr(755,root,root) %{_bindir}/docker
-%attr(755,root,root) %{_sbindir}/docker-containerd
-%attr(755,root,root) %{_sbindir}/docker-containerd-ctr
-%attr(755,root,root) %{_sbindir}/docker-containerd-shim
+%attr(755,root,root) %{_sbindir}/containerd
+%attr(755,root,root) %{_sbindir}/ctr
+%attr(755,root,root) %{_sbindir}/containerd-shim
%attr(755,root,root) %{_sbindir}/docker-init
%attr(755,root,root) %{_sbindir}/docker-proxy
-%attr(755,root,root) %{_sbindir}/docker-runc
+%attr(755,root,root) %{_sbindir}/runc
%attr(755,root,root) %{_sbindir}/dockerd
%attr(755,root,root) %{_libexecdir}/dockerd
%{systemdunitdir}/docker.service
%if %{with vim}
%files -n vim-syntax-%{name}
%defattr(644,root,root,755)
-%doc contrib/syntax/vim/{README.md,LICENSE}
+%doc components/engine/contrib/syntax/vim/{README.md,LICENSE}
%{_vimdatadir}/doc/dockerfile.txt
%{_vimdatadir}/ftdetect/dockerfile.vim
%{_vimdatadir}/syntax/dockerfile.vim
projects / packages / docker-ce.git / blobdiff