forked from pool/docker
Accepting request 1062476 from Virtualization:containers
- update to 20.10.23-ce * see upstream changelog at https://docs.docker.com/engine/release-notes/#201023 - drop kubic flavor as kubic is EOL. this removes: kubelet.env docker-kubic-service.conf 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch OBS-URL: https://build.opensuse.org/request/show/1062476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=128
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
e32f7826c7
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
<multibuild>
|
||||
<package>kubic</package>
|
||||
</multibuild>
|
||||
10
_service
10
_service
@ -3,16 +3,16 @@
|
||||
<param name="url">https://github.com/moby/moby.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">20.10.21_ce_%h</param>
|
||||
<param name="revision">v20.10.21</param>
|
||||
<param name="versionformat">20.10.23_ce_%h</param>
|
||||
<param name="revision">v20.10.23</param>
|
||||
<param name="filename">docker</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/docker/cli.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">20.10.21_ce</param>
|
||||
<param name="revision">v20.10.21</param>
|
||||
<param name="versionformat">20.10.23_ce</param>
|
||||
<param name="revision">v20.10.23</param>
|
||||
<param name="filename">docker-cli</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
@ -20,7 +20,7 @@
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">%H</param>
|
||||
<param name="revision">0dde5c895075df6e3630e76f750a447cf63f4789</param>
|
||||
<param name="revision">05b93e0d3a95952f70c113b0bc5bdb538d7afdd7</param>
|
||||
<param name="filename">docker-libnetwork</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2696414f3d39bb862d2e60e614a4fe2e6a655c65c30742a4a28b776fbbd59bc5
|
||||
size 6590696
|
||||
3
docker-20.10.23_ce_6051f1429.tar.xz
Normal file
3
docker-20.10.23_ce_6051f1429.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d6b832806f3144a4b917657f615d9388081e7c7b3f77db3b4b7c6c01b931686
|
||||
size 6589992
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cfa23215b99aed9c85a401fd1aeb961a5a3f8b3095fb6815ba8eb83cf182481f
|
||||
size 4358052
|
||||
3
docker-cli-20.10.23_ce.tar.xz
Normal file
3
docker-cli-20.10.23_ce.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c2a96dd55814fc22ccfe054b78438963fc139b292696bc3ba7667abd399d7c70
|
||||
size 4320480
|
||||
@ -1,4 +0,0 @@
|
||||
[Service]
|
||||
# Put docker under the podruntime slice. This the recommended
|
||||
# deployment to allow fine resource control on Kubernetes.
|
||||
Slice=podruntime.slice
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:44fa1530b22f18434174b03895c8933b356f254b718855fd7487888afbb10e91
|
||||
size 1983112
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24a4b6aeb1391b2ab9f99fad7343913ecc7191a10669a056e0a2cdf449e3733e
|
||||
size 1983868
|
||||
@ -1,9 +1,6 @@
|
||||
# This is intentional, since we use _multibuild for the flavours.
|
||||
addFilter ("^docker-kubic.src: W: invalid-spec-name")
|
||||
|
||||
# The #! comes from upstream.
|
||||
addFilter ("^docker(-kubic)?-bash-completion.noarch: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
|
||||
addFilter ("^docker(-kubic)?-zsh-completion.noarch: W: sourced-script-with-shebang /etc/zsh_completion.d/docker zsh")
|
||||
addFilter ("^docker-bash-completion.noarch: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
|
||||
addFilter ("^docker-zsh-completion.noarch: W: sourced-script-with-shebang /etc/zsh_completion.d/docker zsh")
|
||||
|
||||
# -test is something that is used internally and isn't actually shipped -- it's a pseduo-source package.
|
||||
addFilter ("^docker(-kubic)?-test.*")
|
||||
addFilter ("^docker-test.*")
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 20.10.23-ce
|
||||
* see upstream changelog at https://docs.docker.com/engine/release-notes/#201023
|
||||
|
||||
- drop kubic flavor as kubic is EOL. this removes:
|
||||
kubelet.env docker-kubic-service.conf 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 6 11:49:32 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
|
||||
107
docker.spec
107
docker.spec
@ -42,15 +42,15 @@
|
||||
# helpfully injects into our build environment from the changelog). If you want
|
||||
# to generate a new git_commit_epoch, use this:
|
||||
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
|
||||
%define real_version 20.10.21
|
||||
%define git_version 3056208812eb
|
||||
%define git_commit_epoch 1666698255
|
||||
%define real_version 20.10.23
|
||||
%define git_version 6051f1429
|
||||
%define git_commit_epoch 1674059068
|
||||
|
||||
# We require a specific pin of libnetwork because it doesn't really do
|
||||
# versioning and minor version mismatches in libnetwork can break Docker
|
||||
# networking. All other key runtime dependencies (containerd, runc) are stable
|
||||
# enough that this isn't necessary.
|
||||
%define libnetwork_version 0dde5c895075df6e3630e76f750a447cf63f4789
|
||||
%define libnetwork_version 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
|
||||
|
||||
%define dist_builddir %{_builddir}/dist-suse
|
||||
%define cli_builddir %{dist_builddir}/src/github.com/docker/cli
|
||||
@ -78,10 +78,6 @@ Source103: README_SUSE.md
|
||||
Source104: docker-audit.rules
|
||||
Source105: docker-daemon.json
|
||||
Source106: docker.sysusers
|
||||
# Kubelet-specific sources.
|
||||
# bsc#1086185 -- but we only apply this on Kubic.
|
||||
Source900: docker-kubic-service.conf
|
||||
Source901: kubelet.env
|
||||
# NOTE: All of these patches are maintained in <https://github.com/suse/docker>
|
||||
# in the suse-<version> branch. Make sure you update the patches in that
|
||||
# branch and then git-format-patch the patch here.
|
||||
@ -91,8 +87,6 @@ Patch100: 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
|
||||
Patch101: 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
|
||||
# SUSE-FEATURE: Add support to mirror unofficial/private registries
|
||||
# <https://github.com/docker/docker/pull/34319>.
|
||||
Patch200: 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
|
||||
# SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1073877 bsc#1099277
|
||||
Patch300: 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
|
||||
# SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/42273. bsc#1183855 bsc#1175081
|
||||
Patch301: 0005-bsc1183855-btrfs-Do-not-disable-quota-on-cleanup.patch
|
||||
@ -117,9 +111,7 @@ BuildRequires: fish
|
||||
BuildRequires: go-go-md2man
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: sysuser-tools
|
||||
# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
|
||||
# for 'golang(API) >= 1.18' here, so just require 1.18 exactly. bsc#1172608
|
||||
BuildRequires: go1.18
|
||||
BuildRequires: golang(API) = 1.18
|
||||
Requires: (apparmor-parser or container-selinux)
|
||||
Requires: ca-certificates-mozilla
|
||||
# The docker-proxy binary used to be in a separate package. We obsolete it,
|
||||
@ -157,26 +149,6 @@ Recommends: lvm2 >= 2.2.89
|
||||
Recommends: git-core >= 1.7
|
||||
ExcludeArch: s390 ppc
|
||||
|
||||
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
|
||||
# packaging, when everything was renamed to -kubic. It also is
|
||||
# used to ensure that nothing complains too much when using
|
||||
# -kubic packages. Hopfully it can be removed one day.
|
||||
%if "%flavour" == "kubic"
|
||||
# Obsolete old packege without the -kubic suffix
|
||||
Obsoletes: %{realname} = 1.12.6
|
||||
Obsoletes: %{realname}_1_12_6
|
||||
# Conflict with non-kubic package, and provide equivalent
|
||||
Conflicts: %{realname}
|
||||
Provides: %{realname} = %{version}
|
||||
# Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package
|
||||
Provides: cri-runtime
|
||||
# No i586 Kubernetes, so docker-kubic must not be built for i586 also
|
||||
ExcludeArch: i586
|
||||
# Disable leap based builds for kubic flavor (bsc#1121412)
|
||||
%if 0%{?suse_version} == 1500 && 0%{?is_opensuse}
|
||||
ExclusiveArch: do_not_build
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Docker complements LXC with a high-level API which operates at the process
|
||||
@ -194,17 +166,6 @@ Requires: %{name} = %{version}
|
||||
Requires: bash-completion
|
||||
Supplements: packageand(%{name}:bash-completion)
|
||||
BuildArch: noarch
|
||||
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
|
||||
# packaging, when everything was renamed to -kubic. It also is
|
||||
# used to ensure that nothing complains too much when using
|
||||
# -kubic packages. Hopfully it can be removed one day.
|
||||
%if "%flavour" == "kubic"
|
||||
# Obsolete old packege without the -kubic suffix
|
||||
Obsoletes: %{realname}-bash-completion = 1.12.6
|
||||
# Conflict with non-kubic package, and provide equivalent
|
||||
Conflicts: %{realname}-bash-completion > 1.12.6
|
||||
Provides: %{realname}-bash-completion = %{version}
|
||||
%endif
|
||||
|
||||
%description bash-completion
|
||||
Bash command line completion support for %{name}.
|
||||
@ -216,17 +177,6 @@ Requires: %{name} = %{version}
|
||||
Requires: zsh
|
||||
Supplements: packageand(%{name}:zsh)
|
||||
BuildArch: noarch
|
||||
# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
|
||||
# packaging, when everything was renamed to -kubic. It also is
|
||||
# used to ensure that nothing complains too much when using
|
||||
# -kubic packages. Hopfully it can be removed one day.
|
||||
%if "%flavour" == "kubic"
|
||||
# Obsolete old packege without the -kubic suffix
|
||||
Obsoletes: %{realname}-zsh-completion = 1.12.6
|
||||
# Conflict with non-kubic package, and provide equivalent
|
||||
Conflicts: %{realname}-zsh-completion > 1.12.6
|
||||
Provides: %{realname}-zsh-completion = %{version}
|
||||
%endif
|
||||
|
||||
%description zsh-completion
|
||||
Zsh command line completion support for %{name}.
|
||||
@ -238,29 +188,10 @@ Requires: %{name} = %{version}
|
||||
Requires: fish
|
||||
Supplements: packageand(%{name}:fish)
|
||||
BuildArch: noarch
|
||||
%if "%flavour" == "kubic"
|
||||
# Conflict with non-kubic package, and provide equivalent
|
||||
Conflicts: %{realname}-fish-completion
|
||||
Provides: %{realname}-fish-completion = %{version}
|
||||
%endif
|
||||
|
||||
%description fish-completion
|
||||
Fish command line completion support for %{name}.
|
||||
|
||||
%if "%flavour" == "kubic"
|
||||
%package kubeadm-criconfig
|
||||
Summary: docker container runtime configuration for kubeadm
|
||||
Group: System/Management
|
||||
Requires: kubernetes-kubeadm
|
||||
Requires(post): %fillup_prereq
|
||||
Supplements: docker-kubic
|
||||
Provides: kubernetes-kubeadm-criconfig
|
||||
Conflicts: cri-o-kubeadm-criconfig
|
||||
|
||||
%description kubeadm-criconfig
|
||||
docker container runtime configuration for kubeadm
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{realname}-%{version}_%{git_version}
|
||||
|
||||
@ -271,10 +202,6 @@ docker container runtime configuration for kubeadm
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%endif
|
||||
%if "%flavour" == "kubic"
|
||||
# PATCH-SUSE: Mirror patch.
|
||||
%patch200 -p1
|
||||
%endif
|
||||
# bsc#1099277
|
||||
%patch300 -p1
|
||||
# bsc#1183855 bsc#1175081
|
||||
@ -395,9 +322,6 @@ install -D -m0755 %{proxy_builddir}/docker-proxy %{buildroot}/%{_bindir}/docker-
|
||||
|
||||
# systemd service
|
||||
install -D -m0644 %{SOURCE100} %{buildroot}%{_unitdir}/%{realname}.service
|
||||
%if "%flavour" == "kubic"
|
||||
install -D -m0644 %{SOURCE900} %{buildroot}%{_unitdir}/%{realname}.service.d/90-kubic.conf
|
||||
%endif
|
||||
ln -sf service %{buildroot}%{_sbindir}/rcdocker
|
||||
|
||||
# udev rules that prevents dolphin to show all docker devices and slows down
|
||||
@ -421,12 +345,6 @@ install -p -m0644 %{cli_builddir}/man/man8/*.8 %{buildroot}%{_mandir}/man8
|
||||
# sysusers.d
|
||||
install -D -m0644 %{SOURCE106} %{buildroot}%{_sysusersdir}/%{name}.conf
|
||||
|
||||
%if "%flavour" == "kubic"
|
||||
# place kubelet.env in fillupdir (for kubeadm-criconfig)
|
||||
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE901}
|
||||
install -D -m0644 %{SOURCE901} %{buildroot}%{_fillupdir}/sysconfig.kubelet
|
||||
%endif
|
||||
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%pre -f %{name}.pre
|
||||
@ -451,11 +369,6 @@ grep -q '^dockremap:' /etc/subgid || \
|
||||
%service_add_post %{realname}.service
|
||||
%{fillup_only -n docker}
|
||||
|
||||
%if "%flavour" == "kubic"
|
||||
%post kubeadm-criconfig
|
||||
%fillup_only -n kubelet
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%service_del_preun %{realname}.service
|
||||
|
||||
@ -474,10 +387,6 @@ grep -q '^dockremap:' /etc/subgid || \
|
||||
|
||||
%{_unitdir}/%{realname}.service
|
||||
%{_sysusersdir}/%{name}.conf
|
||||
%if "%flavour" == "kubic"
|
||||
%dir %{_unitdir}/%{realname}.service.d/
|
||||
%{_unitdir}/%{realname}.service.d/90-kubic.conf
|
||||
%endif
|
||||
|
||||
%dir %{_sysconfdir}/docker
|
||||
%config(noreplace) %{_sysconfdir}/docker/daemon.json
|
||||
@ -503,10 +412,4 @@ grep -q '^dockremap:' /etc/subgid || \
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/fish/vendor_completions.d/%{realname}.fish
|
||||
|
||||
%if "%flavour" == "kubic"
|
||||
%files kubeadm-criconfig
|
||||
%defattr(-,root,root)
|
||||
%{_fillupdir}/sysconfig.kubelet
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1 +0,0 @@
|
||||
KUBELET_EXTRA_ARGS="--cni-bin-dir=@LIBEXECDIR@/cni"
|
||||
Loading…
Reference in New Issue
Block a user