Accepting request 243336 from Virtualization
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/243336 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=2
This commit is contained in:
parent
539c9691f1
commit
d6b7df5719
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:31517dc1f2d4a75827a1f5011bd4a00aff6b8132618f7cf8a34c2ec395550983
|
|
||||||
size 6436187
|
|
3
docker-1.1.2.tar.bz2
Normal file
3
docker-1.1.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4f37d39144b7495820a80c8af8aaf7a4e6fe5bf08c1f767c34a00f2b6b6baa76
|
||||||
|
size 6442718
|
@ -1,3 +1,21 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 25 06:17:04 UTC 2014 - fcastelli@suse.com
|
||||||
|
|
||||||
|
- Updated to 1.1.2:
|
||||||
|
* Runtime:
|
||||||
|
- Fix port allocation for existing containers
|
||||||
|
- Fix containers restart on daemon restart
|
||||||
|
- Updated conflict condition with LXC package.
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 18 09:38:47 UTC 2014 - fcastelli@suse.com
|
||||||
|
|
||||||
|
- Add apparmor-parser runtime dependency
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 18 08:44:29 UTC 2014 - fcastelli@suse.com
|
||||||
|
|
||||||
|
- Build with AppArmor and SELinux support
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 16 13:37:23 UTC 2014 - fcastelli@suse.com
|
Wed Jul 16 13:37:23 UTC 2014 - fcastelli@suse.com
|
||||||
|
|
||||||
|
14
docker.spec
14
docker.spec
@ -1,4 +1,6 @@
|
|||||||
|
#
|
||||||
# spec file for package docker
|
# spec file for package docker
|
||||||
|
#
|
||||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -13,10 +15,11 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
%define git_version dc62f3c
|
|
||||||
|
%define git_version d84a070
|
||||||
|
|
||||||
Name: docker
|
Name: docker
|
||||||
Version: 1.1.1
|
Version: 1.1.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: The Linux container runtime
|
Summary: The Linux container runtime
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -34,11 +37,13 @@ BuildRequires: bash-completion
|
|||||||
BuildRequires: device-mapper-devel >= 1.2.68
|
BuildRequires: device-mapper-devel >= 1.2.68
|
||||||
BuildRequires: glibc-devel-static
|
BuildRequires: glibc-devel-static
|
||||||
BuildRequires: go >= 1.2
|
BuildRequires: go >= 1.2
|
||||||
|
BuildRequires: libapparmor-devel
|
||||||
BuildRequires: libbtrfs-devel >= 3.8
|
BuildRequires: libbtrfs-devel >= 3.8
|
||||||
BuildRequires: procps
|
BuildRequires: procps
|
||||||
BuildRequires: sqlite3-devel
|
BuildRequires: sqlite3-devel
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: zsh
|
BuildRequires: zsh
|
||||||
|
Requires: apparmor-parser
|
||||||
Requires: bridge-utils
|
Requires: bridge-utils
|
||||||
Requires: ca-certificates-mozilla
|
Requires: ca-certificates-mozilla
|
||||||
Requires: git-core >= 1.7
|
Requires: git-core >= 1.7
|
||||||
@ -49,7 +54,7 @@ Requires: lvm2 >= 2.2.89
|
|||||||
Requires: procps
|
Requires: procps
|
||||||
Requires: tar >= 1.26
|
Requires: tar >= 1.26
|
||||||
Requires: xz >= 4.9
|
Requires: xz >= 4.9
|
||||||
Conflicts: lxc >= 1.0
|
Conflicts: lxc < 1.0
|
||||||
PreReq: %fillup_prereq
|
PreReq: %fillup_prereq
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
@ -93,7 +98,7 @@ Zsh command line completion support for %{name}.
|
|||||||
export GOPATH=`pwd`/vendor
|
export GOPATH=`pwd`/vendor
|
||||||
mkdir vendor/src/github.com/dotcloud
|
mkdir vendor/src/github.com/dotcloud
|
||||||
ln -s `pwd` vendor/src/github.com/dotcloud/
|
ln -s `pwd` vendor/src/github.com/dotcloud/
|
||||||
export DOCKER_BUILDTAGS="exclude_graphdriver_aufs"
|
export DOCKER_BUILDTAGS="exclude_graphdriver_aufs apparmor selinux"
|
||||||
export DOCKER_GITCOMMIT=%{git_version}
|
export DOCKER_GITCOMMIT=%{git_version}
|
||||||
./hack/make.sh dynbinary
|
./hack/make.sh dynbinary
|
||||||
|
|
||||||
@ -164,4 +169,3 @@ groupadd -r docker 2>/dev/null || :
|
|||||||
%config %{_sysconfdir}/zsh_completion.d/%{name}
|
%config %{_sysconfdir}/zsh_completion.d/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user