Aleksa Sarai 2016-12-19 14:01:37 +00:00 committed by Git OBS Bridge
parent 2033d2ac73
commit 3d7280619a
5 changed files with 15 additions and 9 deletions

View File

@ -3,8 +3,8 @@
<param name="url">https://github.com/docker/docker.git</param> <param name="url">https://github.com/docker/docker.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="versionformat">1.12.3</param> <param name="versionformat">1.12.5</param>
<param name="revision">v1.12.3</param> <param name="revision">v1.12.5</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">docker-*.tar</param> <param name="file">docker-*.tar</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:096dec850ed5124d9b822eb0dc84291a5ecbd5641ae6295eb228850d8b7805ba
size 11188896

3
docker-1.12.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23c2068ecc2a8a283338143c76ffaf6987a93df767f7f6b6927f73310915485d
size 11190552

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 19 12:41:13 UTC 2016 - jmassaguerpla@suse.com
- update docker to 1.12.5 (bsc#1016307).
This fixes bsc#1015661
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 5 14:52:02 UTC 2016 - jmassaguerpla@suse.com Mon Dec 5 14:52:02 UTC 2016 - jmassaguerpla@suse.com

View File

@ -36,7 +36,7 @@
%global docker_migration_warnfile %{docker_store}/docker-update-message.txt %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
%define docker_graph %{docker_store}/graph %define docker_graph %{docker_store}/graph
%define git_version 8eab29e %define git_version 8eab29e
%define version_unconverted 1.12.3 %define version_unconverted 1.12.5
%define docker_version 1.12.1 %define docker_version 1.12.1
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
# When upgrading to a new version requires the service not to be restarted # When upgrading to a new version requires the service not to be restarted
@ -45,7 +45,7 @@
# 1.10.1 # 1.10.1
%global last_migration_version 1.10.1 %global last_migration_version 1.10.1
Name: docker Name: docker
Version: 1.12.3 Version: 1.12.5
Release: 0 Release: 0
Summary: The Linux container runtime Summary: The Linux container runtime
License: Apache-2.0 License: Apache-2.0
@ -87,8 +87,8 @@ Requires: ca-certificates-mozilla
# execdrivers of Docker. NOTE: The version pinning here matches upstream's # execdrivers of Docker. NOTE: The version pinning here matches upstream's
# Dockerfile to ensure that we don't use a slightly incompatible version of # Dockerfile to ensure that we don't use a slightly incompatible version of
# runC or containerd (which would be bad). # runC or containerd (which would be bad).
Requires: containerd = 0.2.4+gitr565_0366d7e Requires: containerd = 0.2.5+gitr569_2a5e70c
Requires: runc = 0.1.1+gitr2816_02f8fa7 Requires: runc = 0.1.1+gitr2818_f59ba3cdd76f
# Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
Requires: e2fsprogs Requires: e2fsprogs
Requires: git-core >= 1.7 Requires: git-core >= 1.7