39 Commits

Author SHA1 Message Date
Funda Wang
ea0abf4e91 fix CVE-2024-36620, CVE-2024-36621, CVE-2024-36623
(cherry picked from commit c0b254900730351d4f70590eb6692ae88c4523ab)
2024-12-02 10:22:21 +08:00
Funda Wang
24be9a4b91 convert patches into unix format 2024-11-29 12:32:20 +08:00
Funda Wang
696c7ddfa2 rename back to moby 2024-11-22 17:36:06 +08:00
shechenglong
e64d29d704
Resolving installation conflicts between docker-engine and libnetwork
Signed-off-by: shechenglong <shechenglong@xfusion.com>
2024-11-14 09:37:33 +00:00
shechenglong
644f041567
Don't check source exists with CreateMountpoint
Signed-off-by: shechenglong <shechenglong@xfusion.com>
2024-11-11 12:01:44 +00:00
shechenglong
578668d15a
sync group creation to 24.03-sp1
Signed-off-by: shechenglong <shechenglong@xfusion.com>
2024-11-08 08:35:12 +00:00
ChendongSun
86ec91220a
Add container.Output utility
Signed-off-by: ChendongSun <sunchendong@xfusion.com>
2024-11-06 06:29:26 +00:00
ChendongSun
74f5abf9d7
omit missing Created field from ImageInspect response
Signed-off-by: ChendongSun <sunchendong@xfusion.com>
2024-11-04 07:13:04 +00:00
yaoguangzhong
aef69ee6a1 backport upstream patch to fix libnetwork/osl test TestAddRemoveInterface
Signed-off-by: Guangzhong Yao <yaoguangzhong@xfusion.com>
2024-10-31 15:53:00 +08:00
yaoguangzhong
83abe347ac modify patch number for moby package
Signed-off-by: Guangzhong Yao <yaoguaungzhong@xfusion.com>
2024-10-29 21:24:50 +08:00
yaoguangzhong
e8023148f5 fix build warnings for moby.spec
Signed-off-by: Guangzhong Yao <yaoguangzhong@xfusion.com>
2024-10-29 20:44:32 +08:00
tiberium
d7e1a30c68 backport upstream patch to fix function declaration without a prototype(-Wstrict-prototypes) error
(cherry picked from commit 706f29a8b38a56229340cf43835efde46691f4fe)
2024-10-22 16:30:17 +08:00
zhangxianting
3c88542e9e fix CVE-2024-41110
(cherry picked from commit 7de97fd428cf9a6a81d91683083a8b22b3dfde4e)
2024-07-26 10:51:06 +08:00
lvxiangcong
9986014272 fix-docker-swarm-run-failed-for-loongarch64
(cherry picked from commit 6a629c5cc2eed73fdf1703c5ca010d4260e2acab)
2024-07-15 19:29:19 +08:00
bwzhang
d4078871de fix bug by using docker-proxy in the source file to get better compatibility
(cherry picked from commit a786aaffbbd19963c3db674d0a457f5648e41a32)
2024-07-03 09:52:10 +08:00
shechenglong
aceb0715f6 software package name moby is changed to docker
Signed-off-by: shechenglong <shechenglong@xfusion.com>
(cherry picked from commit f287400f7f2c88dbb00279cff1491d2062fbf424)
2024-06-28 16:14:27 +08:00
shechenglong
4d65aa0909 software package name moby is changed to docker
Signed-off-by: shechenglong <shechenglong@xfusion.com>
(cherry picked from commit b945727b5d6ca8929d91177284511b76df2b7dc2)
2024-06-28 16:14:27 +08:00
shechenglong
68aca62507 software package name moby is changed to docker
Signed-off-by: shechenglong <shechenglong@xfusion.com>
(cherry picked from commit 57a9eb74ce4e8dadb3fe0b31c1d4d52d845352c7)
2024-06-28 16:14:27 +08:00
zhaixiaojuan
8f793b0dcf Add loongarch64 seccomp support
(cherry picked from commit 1cc08b4ce3ff13624e1282c216306ac54967cea4)
2024-06-28 16:12:08 +08:00
wanglmb
88f3c32b05 clean dependency between engine and cli
Signed-off-by: wanglmb <wanglimin@xfusion.com>
(cherry picked from commit 4769668e2b15b428f18d30ff34403eb60bbe8c85)
2024-06-11 10:31:07 +08:00
lvxiangcong
5539b60518 fix install error failed to docker.service does not exist
(cherry picked from commit a366861d17b865c41a00a0bafa6ae5b4b35ff580)
2024-05-13 18:39:37 +08:00
lvxiangcong
7a18e272be fix CVE-2024-32473
(cherry picked from commit 8b5f202b7d73b9cfbf374e171fc33f47c4c6eae0)
2024-04-22 15:20:01 +08:00
lvxiangcong
df6e6c3b0e fix CVE-2024-29018
(cherry picked from commit 3e8a821b9db8089e7333f29a5d0ba8ea1a8f51cb)
2024-04-18 10:00:31 +08:00
shechenglong
d7b02acf40 update to 25.0.3
Signed-off-by: shechenglong <shechenglong@xfusion.com>
2024-02-07 10:05:18 +08:00
tinktiny666
75d7556db9
Adapt docker-runc to be changed to runc
Signed-off-by: tinktiny666 <maokecheng@xfusion.com>
2023-12-28 08:43:18 +00:00
xulei
3ac42cf13f
Fix the missing socketGroup permissions for only installing moby-engine
Signed-off-by: xulei <xulei@xfusion.com>
2023-09-26 02:43:27 +00:00
xulei
dd0d9f47cb Optimize the apply patch method 2023-09-19 15:17:37 +08:00
xulei
de09fceb14
Fix missing runc dependencies and conflicts with the installation of docker-engine
Signed-off-by: xulei <xulei@xfusion.com>
2023-09-14 03:58:07 +00:00
xulei
6389bbea74
Fix missing runc dependencies and conflicts with the installation of docker-engine
Signed-off-by: xulei <xulei@xfusion.com>
2023-09-14 03:28:37 +00:00
xulei
6863476307
Fix the conflict libnetwork installation
Signed-off-by: xulei <xulei@xfusion.com>
2023-09-05 06:15:14 +00:00
xu_lei_123
2ae16fee23 Synchronize version 20.10.25 of bugfix 2023-07-27 07:48:34 +08:00
xu_lei_123
a9520fdc6f update to 20.10.24 2023-04-10 12:38:50 +08:00
dayshappy
eebad5ad47 [Backport]Dockerfile: configure code dir as "safe" directory
CI is failing when bind-mounting source from the host into the dev-container;

    fatal: detected dubious ownership in repository at '/go/src/github.com/docker/docker'
    To add an exception for this directory, call:

        git config --global --add safe.directory /go/src/github.com/docker/docker

reference:https://github.com/moby/moby/pull/44946/commits

Signed-off-by: dayshappy <zhangzhihui@xfusion.com>
2023-04-04 09:58:34 +08:00
dayshappy
b823202052 [Backport]update containerd binary to v1.6.16
- Fix push error propagation
- Fix slice append error with HugepageLimits for Linux
- Update default seccomp profile for PKU and CAP_SYS_NICE
- Fix overlayfs error when upperdirlabel option is set

full diff: containerd/containerd@v1.6.15...v1.6.16

reference:https://github.com/moby/moby/commit/526ae907e2

Signed-off-by: dayshappy <zhangzhihui@xfusion.com>
2023-04-01 10:38:31 +08:00
xu_lei_123
9ef6aee2d2 update to 20.10.23 2023-03-29 22:02:17 +08:00
xu_lei_123
65de719cd9 enhance container behavior 2023-03-09 10:01:46 +08:00
xu_lei_123
d4bd95473a Change to BuildRequires golang-1.17.3 2022-12-28 17:10:22 +08:00
wanglimin
2e25dfc025 revert any to interface{} temporarily to allow builtable with golang-1.17.x
it will be withdrawed if golang upgrade to 1.18.x in the branch
2022-12-21 10:09:27 +08:00
wanglimin
7b6ccd484a initial docker-20.10.21-1 2022-12-20 17:30:52 +08:00