forked from pool/docker
This commit is contained in:
committed by
Git OBS Bridge
parent
fed8ecda73
commit
da53caf134
16
docker.spec
16
docker.spec
@@ -22,7 +22,7 @@
|
||||
%global docker_migration_warnfile %{docker_store}/docker-update-message.txt
|
||||
%define docker_graph %{docker_store}/graph
|
||||
%define git_version 78d1802
|
||||
%define version_unconverted 1.13.0
|
||||
%define version_unconverted 17.04.0_ce
|
||||
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
|
||||
# When upgrading to a new version requires the service not to be restarted
|
||||
# Due to a long migration process update last_migration_version to the new version
|
||||
@@ -30,7 +30,7 @@
|
||||
# 1.10.1
|
||||
%global last_migration_version 1.10.1
|
||||
Name: docker
|
||||
Version: 1.13.0
|
||||
Version: 17.04.0_ce
|
||||
Release: 0
|
||||
Summary: The Linux container runtime
|
||||
License: Apache-2.0
|
||||
@@ -54,8 +54,6 @@ Patch200: secrets-0001-daemon-allow-directory-creation-in-run-secrets.patc
|
||||
Patch201: secrets-0002-SUSE-implement-SUSE-container-secrets.patch
|
||||
# PATCH-FIX-UPSTREAM: Backports.
|
||||
Patch300: integration-cli-fix-TestInfoEnsureSucceeds.patch
|
||||
Patch301: pr31549-cmd-docker-fix-TestDaemonCommand.patch
|
||||
Patch302: pr31773-daemon-also-ensureDefaultApparmorProfile-in-exec-pat.patch
|
||||
BuildRequires: audit
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: ca-certificates
|
||||
@@ -79,13 +77,13 @@ BuildRequires: zsh
|
||||
Requires: apparmor-parser
|
||||
Requires: bridge-utils
|
||||
Requires: ca-certificates-mozilla
|
||||
Requires: docker-libnetwork = 0.0.0+git20161019.0f53435
|
||||
Requires: docker-libnetwork = 0.0.0+git20170119.7b2b1fe
|
||||
# Containerd and runC are required as they are the only currently supported
|
||||
# execdrivers of Docker. NOTE: The version pinning here matches upstream's
|
||||
# Dockerfile to ensure that we don't use a slightly incompatible version of
|
||||
# runC or containerd (which would be bad).
|
||||
Requires: containerd = 0.2.5+gitr608_03e5862
|
||||
Requires: runc = 0.1.1+gitr2942_2f7393a
|
||||
Requires: containerd = 0.2.5+gitr639_422e31c
|
||||
Requires: runc = 0.1.1+gitr2947_9c2d8d1
|
||||
# Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
|
||||
Requires: e2fsprogs
|
||||
Requires: git-core >= 1.7
|
||||
@@ -168,8 +166,6 @@ Test package for docker. It contains the source code and the tests.
|
||||
%patch201 -p1
|
||||
%endif
|
||||
%patch300 -p1
|
||||
%patch301 -p1
|
||||
%patch302 -p1
|
||||
cp %{SOURCE7} .
|
||||
cp %{SOURCE10} .
|
||||
|
||||
@@ -376,7 +372,7 @@ fi
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README.md LICENSE README_SUSE.md
|
||||
%doc README.md LICENSE README_SUSE.md CHANGELOG.md
|
||||
%{_bindir}/docker
|
||||
%{_bindir}/dockerd
|
||||
%{_sbindir}/rcdocker
|
||||
|
Reference in New Issue
Block a user