rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 826658 from Virtualization:containers

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/826658
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2020-08-16 18:26:09 +00:00 committed by Git OBS Bridge
commit e93c3484d1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 3 16:58:07 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
-------------------------------------------------------------------
Tue Jun 30 23:00:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

1
docker.spec
View File

@ -416,6 +416,7 @@ find %{buildroot}%{_prefix}/src/docker \
%if "%flavour" == "kubic"
# place kubelet.env in fillupdir (for kubeadm-criconfig)
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE5}
install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet
%endif

2
kubelet.env
View File

@ -1 +1 @@
KUBELET_EXTRA_ARGS="--cni-bin-dir=/usr/lib/cni"
KUBELET_EXTRA_ARGS="--cni-bin-dir=@LIBEXECDIR@/cni"