Accepting request 734438 from home:cyphar:docker

- Update to Docker 19.03.2-ce. See upstream changelog in the packaged
  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1150397

OBS-URL: https://build.opensuse.org/request/show/734438
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=320
This commit is contained in:
Aleksa Sarai 2019-10-02 00:37:03 +00:00 committed by Git OBS Bridge
parent 938c898611
commit 56c9b0f980
5 changed files with 17 additions and 10 deletions

View File

@ -3,8 +3,8 @@
<param name="url">https://github.com/docker/docker-ce.git</param> <param name="url">https://github.com/docker/docker-ce.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">19.03.1_ce_%h</param> <param name="versionformat">19.03.2_ce_%h</param>
<param name="revision">v19.03.1</param> <param name="revision">v19.03.2</param>
<param name="filename">docker</param> <param name="filename">docker</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c31df0bc4328d4a3977d1dc30ed3c67a234debcfb5087c9801cb00fe4f25847
size 9986852

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 1 23:54:25 UTC 2019 - Aleksa Sarai <asarai@suse.com>
- Update to Docker 19.03.2-ce. See upstream changelog in the packaged
/usr/share/doc/packages/docker/CHANGELOG.md. bsc#1150397
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 05:14:44 UTC 2019 - Aleksa Sarai <asarai@suse.com> Tue Jul 30 05:14:44 UTC 2019 - Aleksa Sarai <asarai@suse.com>

View File

@ -42,8 +42,8 @@
# helpfully injects into our build environment from the changelog). If you want # helpfully injects into our build environment from the changelog). If you want
# to generate a new git_commit_epoch, use this: # to generate a new git_commit_epoch, use this:
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
%define git_version 74b1e89e8ac6 %define git_version 6a30dfca0366
%define git_commit_epoch 1564087121 %define git_commit_epoch 1567053734
# These are the git commits required. We verify them against the source to make # These are the git commits required. We verify them against the source to make
# sure we didn't miss anything important when doing upgrades. # sure we didn't miss anything important when doing upgrades.
@ -52,7 +52,7 @@
%define required_libnetwork fc5a7d91d54cc98f64fc28f9e288b46a0bee756c %define required_libnetwork fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
Name: %{realname}%{name_suffix} Name: %{realname}%{name_suffix}
Version: 19.03.1_ce Version: 19.03.2_ce
Release: 0 Release: 0
Summary: The Moby-project Linux container runtime Summary: The Moby-project Linux container runtime
License: Apache-2.0 License: Apache-2.0
@ -422,8 +422,9 @@ getent passwd dockremap >/dev/null || \
# "useradd -r" doesn't add sub[ug]ids so we manually add some. Hopefully there # "useradd -r" doesn't add sub[ug]ids so we manually add some. Hopefully there
# aren't any conflicts here, because usermod doesn't provide the same "get # aren't any conflicts here, because usermod doesn't provide the same "get
# unusued range" feature that dockremap does. # unusued range" feature that dockremap does.
grep -q '^dockremap:' /etc/sub[ug]id || \ touch /etc/sub{uid,gid}
usermod -v 100000000-100065536 -w 100000000-100065536 dockremap grep -q '^dockremap:' /etc/sub{uid,gid} || \
usermod -v 100000000-200000000 -w 100000000-200000000 dockremap
%service_add_pre %{realname}.service %service_add_pre %{realname}.service