Skip to content

feat(compose): install app images into dockerd's containerd #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mike-sul wants to merge 5 commits into
base: main
Choose a base branch
from
+2,145 −79
Draft

feat(compose): install app images into dockerd's containerd #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d708a82
docs(design): plan and record the install into containerd
mike-sul Oct 21, 2026
938c693
feat(compose): discover containerd behind dockerd from /info
mike-sul Oct 12, 2026
3cf4d2e
feat(compose): install app images into dockerd's containerd
mike-sul Oct 12, 2026
5cc3aa6
feat(cli): take the install lock in rm, uninstall and prune
mike-sul Oct 12, 2026
954e58a
test(integration): cover the containerd install path
mike-sul Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ tidy-mod:
preload-images:
test/fixtures/preload-images.sh

# -p 1: the test binaries share one dockerd, one publisher dockerd and one app store,
# so the packages must not run concurrently
test-e2e: $(exe) preload-images
@$(GO) test -v ./...
@$(GO) test -v -p 1 ./...

test-smoke: $(exe) preload-images
@$(GO) test -v -run TestSmoke test/integration/smoke_test.go
Expand Down
6 changes: 6 additions & 0 deletions cmd/composectl/cmd/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package composectl
import (
"encoding/json"
"fmt"
"github.com/foundriesio/composeapp/pkg/compose"
v1 "github.com/foundriesio/composeapp/pkg/compose/v1"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -34,8 +35,13 @@ func init() {
func pruneApps(cmd *cobra.Command, opts *pruneOptions) {
cs, err := v1.NewAppStore(config.StoreRoot, config.Platform)
DieNotNil(err)
unlock, err := compose.LockInstall(config.StoreRoot)
DieNotNil(err)
defer unlock()
prunedBlobs, err := cs.Prune(cmd.Context())
DieNotNil(err)
// Leases left by interrupted installs hold blobs and snapshots in dockerd's containerd.
DieNotNil(compose.PruneInstallLeases(cmd.Context(), config), "failed to prune install leases")
if opts.Format == "json" {
if b, err := json.MarshalIndent(prunedBlobs, "", " "); err == nil {
fmt.Println(string(b))
Expand Down
429 changes: 429 additions & 0 deletions docs/containerd-install-plan-2026-10-08.md
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,39 @@ require (
go.etcd.io/bbolt v1.3.7
golang.org/x/net v0.26.0
golang.org/x/sync v0.7.0
golang.org/x/sys v0.29.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/continuity v0.4.2 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/ttrpc v1.2.3 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -50,9 +61,13 @@ require (
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/signal v0.7.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
Expand All @@ -64,6 +79,7 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
Expand All @@ -72,8 +88,9 @@ require (
go.opentelemetry.io/otel/trace v1.21.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Expand Down
Loading
Loading