Skip to content

Commit 04949b2

Browse files
build: upgrade Docker to v29 (#106)
* ci: bump version * build: upgrade dependencies * build: remove redundant instructions * build: optimize Dockerfile * build: bump Docker version * Revert "build: bump Docker version" This reverts commit a5b7850. * ci: trigger ci * Reapply "build: bump Docker version" This reverts commit a9f3ed8. * empty * ci: trigger ci * build: upgrade dependencies * fix: add `readline` * Revert "fix: add `readline`" This reverts commit 6b0b019. * Revert "build: bump Docker version" This reverts commit a5b7850. * build: revert dependency changes * build: upgrade Docker to v29 * ci: trigger ci * build: reset Dockerfile * build: donwgrade Docker to 29.0.4 * fix: disable `containerd` image store * build: upgrade DOcker to 29.1.4 * ci: bump version --------- Co-authored-by: Mikhail Klimko <mikhail.klimko@octopus.com>
1 parent 0ca0e54 commit 04949b2

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CI relies on this ARG. Don't remove or rename it
2-
ARG DOCKER_VERSION=28.5.2
2+
ARG DOCKER_VERSION=29.1.4
33

44
# dind-cleaner
55
FROM golang:1.25-alpine3.23 AS cleaner

run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ do
212212
echo "Current memory.oom.group value: $(cat "${MEMORY_OOM_GROUP}")"
213213

214214
# Explicitly set --cgroup-parent to prevent DinD containers escaping the pod cgroup on cgroup v2.
215-
dockerd --cgroup-parent "${CURRENT_CGROUP}/codefresh-dind" ${DOCKERD_PARAMS} <&- &
215+
dockerd --feature containerd-snapshotter=false --cgroup-parent "${CURRENT_CGROUP}/codefresh-dind" ${DOCKERD_PARAMS} <&- &
216216
fi
217217

218218
echo "Waiting at most 20s for docker pid"

service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 3.0.8
1+
version: 3.0.9

0 commit comments

Comments
 (0)