mirror of
https://abf.rosa.ru/djam/docker.git
synced 2025-02-23 09:32:49 +00:00
Updated to 1.9.1
This commit is contained in:
Denis Silakov
parent
1685e0745f
commit
f38d8608a1
2 changed files with 10 additions and 143 deletions
1
.abf.yml
1
.abf.yml
|
|
@ -1,2 +1,3 @@
|
|||
sources:
|
||||
v1.6.2.tar.gz: 030c87e48835e6fcb54c44d6ba250c1764bcda1a
|
||||
v1.9.1.tar.gz: ad9e6c0f1ebaa7f2ccfa491c6e860e6a6155a6b2
|
||||
|
|
|
|||
152
docker.spec
152
docker.spec
|
|
@ -13,7 +13,7 @@
|
|||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: docker
|
||||
Version: 1.6.2
|
||||
Version: 1.9.1
|
||||
Release: 1
|
||||
Summary: Automates deployment of containerized applications
|
||||
License: ASL 2.0
|
||||
|
|
@ -85,7 +85,7 @@ servers, OpenStack clusters, public instances, or combinations of the above.
|
|||
%package devel
|
||||
BuildRequires: golang >= 1.3.3
|
||||
Requires: golang >= 1.3.3
|
||||
Requires: docker-pkg-devel
|
||||
%rename docker-pkg-devel
|
||||
Summary: A golang registry for global request variables (source libraries)
|
||||
Provides: golang(%{import_path}) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/api) = %{version}-%{release}
|
||||
|
|
@ -135,14 +135,6 @@ Provides: golang(%{import_path}/registry/v2) = %{version}-%{release}
|
|||
Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/utils) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This is the source libraries for docker.
|
||||
|
||||
%package pkg-devel
|
||||
BuildRequires: golang >= 1.3.3
|
||||
Requires: golang >= 1.3.3
|
||||
Summary: A golang registry for global request variables (source libraries)
|
||||
Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}
|
||||
|
|
@ -166,34 +158,18 @@ Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
|
|||
Provides: golang(%{import_path}/pkg/user) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
|
||||
|
||||
%description pkg-devel
|
||||
These source librariees are provided by docker, but are independent of docker
|
||||
specific logic. The import paths of %{import_path}/pkg/...
|
||||
%description devel
|
||||
This is the source libraries for docker.
|
||||
|
||||
%prep
|
||||
#%setup -q -n docker-%{commit}
|
||||
%setup -q -n docker-%{version}
|
||||
#rm -rf vendor/src/code.google.com vendor/src/github.com/{coreos,docker/libtrust,godbus,gorilla,kr,syndtr,tchap}
|
||||
#for f in `find . -name '*.go'`; do
|
||||
#perl -pi -e 's|github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar|archive/tar|' $f
|
||||
#done
|
||||
|
||||
%build
|
||||
#mkdir -p _build
|
||||
|
||||
#pushd _build
|
||||
#mkdir -p src/github.com/docker
|
||||
#ln -s $(dirs +1 -l) src/github.com/docker/docker
|
||||
#popd
|
||||
|
||||
export DOCKER_GITCOMMIT="%{shortcommit}"
|
||||
#export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
|
||||
#export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
|
||||
|
||||
export CFLAGS="-I/usr/share/go/src/runtime"
|
||||
AUTO_GOPATH=1 ./hack/make.sh dynbinary
|
||||
#hack/make.sh dynbinary
|
||||
docs/man/md2man-all.sh
|
||||
man/md2man-all.sh
|
||||
cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
|
||||
cp contrib/syntax/vim/README.md README-vim-syntax.md
|
||||
|
||||
|
|
@ -211,9 +187,9 @@ install -d %{buildroot}%{_libexecdir}/cache/docker
|
|||
|
||||
# install manpages
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1
|
||||
install -p -m 644 man/man1/docker*.1 %{buildroot}%{_mandir}/man1
|
||||
install -d %{buildroot}%{_mandir}/man5
|
||||
install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
|
||||
install -p -m 644 man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
|
||||
|
||||
# install bash completion
|
||||
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
|
|
@ -247,8 +223,7 @@ perl -pi -e "s|^SocketGroup=docker|SocketGroup=docker\n# So do it another way\nE
|
|||
# sources
|
||||
install -d -p %{buildroot}/%{gosrc}
|
||||
|
||||
for dir in api autogen builtins daemon engine graph \
|
||||
image links nat opts pkg registry runconfig utils
|
||||
for dir in */
|
||||
do
|
||||
cp -rpav $dir %{buildroot}/%{gosrc}
|
||||
done
|
||||
|
|
@ -291,113 +266,4 @@ exit 0
|
|||
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
|
||||
|
||||
%files devel
|
||||
%dir %{gosrc}
|
||||
%dir %{gosrc}/api
|
||||
%{gosrc}/api/README.md
|
||||
%{gosrc}/api/*.go
|
||||
%dir %{gosrc}/api/client
|
||||
%{gosrc}/api/client/*.go
|
||||
%dir %{gosrc}/api/server
|
||||
%{gosrc}/api/server/*.go
|
||||
%dir %{gosrc}/api/types
|
||||
%{gosrc}/api/types/*.go
|
||||
%dir %{gosrc}/autogen/dockerversion
|
||||
%{gosrc}/autogen/dockerversion/*.go
|
||||
%dir %{gosrc}/builtins
|
||||
%{gosrc}/builtins/*.go
|
||||
%dir %{gosrc}/daemon
|
||||
%{gosrc}/daemon/*.go
|
||||
%{gosrc}/daemon/README.md
|
||||
%dir %{gosrc}/daemon/execdriver
|
||||
%{gosrc}/daemon/execdriver/*.go
|
||||
%dir %{gosrc}/daemon/execdriver/execdrivers
|
||||
%{gosrc}/daemon/execdriver/execdrivers/*.go
|
||||
%dir %{gosrc}/daemon/execdriver/lxc
|
||||
%{gosrc}/daemon/execdriver/lxc/*.go
|
||||
%dir %{gosrc}/daemon/execdriver/native
|
||||
%{gosrc}/daemon/execdriver/native/*.go
|
||||
%dir %{gosrc}/daemon/execdriver/native/template
|
||||
%{gosrc}/daemon/execdriver/native/template/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver
|
||||
%{gosrc}/daemon/graphdriver/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver/aufs
|
||||
%{gosrc}/daemon/graphdriver/aufs/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver/btrfs
|
||||
%{gosrc}/daemon/graphdriver/btrfs/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver/devmapper
|
||||
%{gosrc}/daemon/graphdriver/devmapper/*.go
|
||||
%{gosrc}/daemon/graphdriver/devmapper/README.md
|
||||
%dir %{gosrc}/daemon/graphdriver/graphtest
|
||||
%{gosrc}/daemon/graphdriver/graphtest/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver/overlay
|
||||
%{gosrc}/daemon/graphdriver/overlay/*.go
|
||||
%dir %{gosrc}/daemon/graphdriver/vfs
|
||||
%{gosrc}/daemon/graphdriver/vfs/*.go
|
||||
%dir %{gosrc}/daemon/logger
|
||||
%{gosrc}/daemon/logger/*.go
|
||||
%dir %{gosrc}/daemon/logger/jsonfilelog
|
||||
%{gosrc}/daemon/logger/jsonfilelog/*.go
|
||||
%dir %{gosrc}/daemon/logger/syslog
|
||||
%{gosrc}/daemon/logger/syslog/*.go
|
||||
%dir %{gosrc}/daemon/networkdriver
|
||||
%dir %{gosrc}/daemon/networkdriver/bridge
|
||||
%{gosrc}/daemon/networkdriver/bridge/*.go
|
||||
%dir %{gosrc}/daemon/networkdriver/ipallocator
|
||||
%{gosrc}/daemon/networkdriver/ipallocator/*.go
|
||||
%{gosrc}/daemon/networkdriver/*.go
|
||||
%dir %{gosrc}/daemon/networkdriver/portallocator
|
||||
%{gosrc}/daemon/networkdriver/portallocator/*.go
|
||||
%dir %{gosrc}/daemon/networkdriver/portmapper
|
||||
%{gosrc}/daemon/networkdriver/portmapper/*.go
|
||||
%dir %{gosrc}/engine
|
||||
%{gosrc}/engine/*.go
|
||||
%dir %{gosrc}/graph
|
||||
%{gosrc}/graph/*.go
|
||||
%dir %{gosrc}/image
|
||||
%{gosrc}/image/*.go
|
||||
%dir %{gosrc}/image/spec
|
||||
%{gosrc}/image/spec/*.md
|
||||
%dir %{gosrc}/links
|
||||
%{gosrc}/links/*.go
|
||||
%dir %{gosrc}/nat
|
||||
%{gosrc}/nat/*.go
|
||||
%dir %{gosrc}/opts
|
||||
%{gosrc}/opts/*.go
|
||||
%dir %{gosrc}/pkg
|
||||
%dir %{gosrc}/pkg/term
|
||||
%dir %{gosrc}/pkg/term/winconsole
|
||||
%{gosrc}/pkg/term/winconsole/*.go
|
||||
%dir %{gosrc}/registry
|
||||
%dir %{gosrc}/registry/v2
|
||||
%{gosrc}/registry/*.go
|
||||
%{gosrc}/registry/v2/*.go
|
||||
%dir %{gosrc}/runconfig
|
||||
%{gosrc}/runconfig/*.go
|
||||
%dir %{gosrc}/utils
|
||||
%{gosrc}/utils/*.go
|
||||
|
||||
%files pkg-devel
|
||||
%dir %{gosrc}
|
||||
%dir %{gosrc}/pkg
|
||||
%{gosrc}/pkg/README.md
|
||||
%dir %{gosrc}/pkg/archive
|
||||
%{gosrc}/pkg/*/README.md
|
||||
%{gosrc}/pkg/*/LICENSE*
|
||||
%{gosrc}/pkg/*/*.go
|
||||
%dir %{gosrc}/pkg/archive/testdata
|
||||
%{gosrc}/pkg/archive/testdata/broken.tar
|
||||
%dir %{gosrc}/pkg/mflag/example
|
||||
%{gosrc}/pkg/mflag/example/example.go
|
||||
%dir %{gosrc}/pkg/networkfs/etchosts
|
||||
%dir %{gosrc}/pkg/networkfs/resolvconf
|
||||
%{gosrc}/pkg/networkfs/*/*.go
|
||||
%dir %{gosrc}/pkg/parsers/filters
|
||||
%dir %{gosrc}/pkg/parsers/kernel
|
||||
%{gosrc}/pkg/parsers/*/*.go
|
||||
%{gosrc}/pkg/tarsum/tarsum_spec.md
|
||||
%dir %{gosrc}/pkg/tarsum/testdata
|
||||
%dir %{gosrc}/pkg/tarsum/testdata/collision
|
||||
%dir %{gosrc}/pkg/tarsum/testdata/xattr
|
||||
%dir %{gosrc}/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
|
||||
%dir %{gosrc}/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
|
||||
%{gosrc}/pkg/tarsum/testdata/*/*
|
||||
%{gosrc}/*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue