Accepting request 717242 from home:cyphar:docker
- Move bash-completion to correct location. - Update to Docker 18.09.8-ce. See upstream changelog in the packaged /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1142160 CVE-2019-13509 OBS-URL: https://build.opensuse.org/request/show/717242 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=314
This commit is contained in:
parent
9f66d3bb9c
commit
2bf28b0b21
4
_service
4
_service
@ -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">18.09.7_ce_%h</param>
|
<param name="versionformat">18.09.8_ce_%h</param>
|
||||||
<param name="revision">v18.09.7</param>
|
<param name="revision">v18.09.8</param>
|
||||||
<param name="filename">docker</param>
|
<param name="filename">docker</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a84e46e28a2f23f7303146f650649e6ff18b3dbb96a842d538b6458f63d8a3ce
|
|
||||||
size 9343716
|
|
3
docker-18.09.8_ce_0dd43dd87fd5.tar.xz
Normal file
3
docker-18.09.8_ce_0dd43dd87fd5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e880c4ce4da35e4dd723c8b8e8dbedf95612e8bb1f423bbd900726fb47069068
|
||||||
|
size 9344440
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 17 23:15:33 UTC 2019 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
- Move bash-completion to correct location.
|
||||||
|
- Update to Docker 18.09.8-ce. See upstream changelog in the packaged
|
||||||
|
/usr/share/doc/packages/docker/CHANGELOG.md. bsc#1142160 CVE-2019-13509
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 28 01:21:19 UTC 2019 - Aleksa Sarai <asarai@suse.com>
|
Fri Jun 28 01:21:19 UTC 2019 - Aleksa Sarai <asarai@suse.com>
|
||||||
|
|
||||||
|
12
docker.spec
12
docker.spec
@ -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 2d0083d657f8
|
%define git_version 0dd43dd87fd5
|
||||||
%define git_commit_epoch 1561655613
|
%define git_commit_epoch 1563383036
|
||||||
|
|
||||||
# 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 e7933d41e7b206756115aa9df5e0599fc5169742
|
%define required_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742
|
||||||
|
|
||||||
Name: %{realname}%{name_suffix}
|
Name: %{realname}%{name_suffix}
|
||||||
Version: 18.09.7_ce
|
Version: 18.09.8_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
|
||||||
@ -374,7 +374,7 @@ install -Dd -m 0755 \
|
|||||||
%{buildroot}%{_sysconfdir}/init.d \
|
%{buildroot}%{_sysconfdir}/init.d \
|
||||||
%{buildroot}%{_sbindir}
|
%{buildroot}%{_sbindir}
|
||||||
|
|
||||||
install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{realname}"
|
install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_datarootdir}/bash-completion/completions/%{realname}"
|
||||||
install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}"
|
install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}"
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -487,11 +487,11 @@ getent group docker >/dev/null || groupadd -r docker
|
|||||||
|
|
||||||
%files bash-completion
|
%files bash-completion
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%config %{_sysconfdir}/bash_completion.d/%{realname}
|
%{_datarootdir}/bash-completion/completions/%{realname}
|
||||||
|
|
||||||
%files zsh-completion
|
%files zsh-completion
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%config %{_sysconfdir}/zsh_completion.d/%{realname}
|
%{_sysconfdir}/zsh_completion.d/%{realname}
|
||||||
|
|
||||||
%files test
|
%files test
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user