diff --git a/VERSION-vendor b/VERSION-vendor index 666a0bb449731fb847712864adef68dac774e6ce..48ca1c7bcf0c04063706bced733cf635cf4f4603 100644 --- a/VERSION-vendor +++ b/VERSION-vendor @@ -1 +1 @@ -18.09.0.335 +18.09.0.336 diff --git a/docker.spec b/docker.spec index b6e209bda034c35def94fc6821d39b6185d7c081..ee8180830ea08b24bcbeabcf41694767c45c3ccc 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 335 +Release: 336 Epoch: 2 Summary: The open-source application container engine Group: Tools/Docker @@ -22,7 +22,7 @@ URL: https://mobyproject.org # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh) BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel -BuildRequires: tar containerd docker-runc docker-proxy git +BuildRequires: tar containerd runc docker-proxy git # required packages on install Requires: /bin/sh iptables tar xz device-mapper-libs >= 1.02.90-1 systemd-units @@ -213,6 +213,12 @@ fi %endif %changelog +* Thu Jun 13 2024 zhongjiawei - 18.09.0-336 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify runc rpm package name to runc + * Wed May 08 2024 chenjiankun - 18.09.0-335 - Type:CVE - CVE:CVE-2024-32473 diff --git a/git-commit b/git-commit index 039776e0ed07d736c9d81b1a639e9d0113846d1e..d2bb21369a810dc94f52b1371aec21b19053dc7a 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -4ca0e267ad268d13264a7d191f69d163410352cf +4675816506f3dff800eea181d86ae6a0ff6e69af