Skip to content
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
bf73593
partial sdk client, more tests
michaeldwan May 13, 2025
7820044
note to self
michaeldwan May 14, 2025
6dbfdb1
fix container log multiplexing
michaeldwan May 14, 2025
dd16c9a
return correct not found error from logs
michaeldwan May 14, 2025
1fb618b
test registry helpers for auth, image inspection
michaeldwan May 14, 2025
17d80d3
test helpers for image refs, concurrent loads
michaeldwan May 14, 2025
15f1f00
api client push, authentication support
michaeldwan May 14, 2025
8813150
helpers to map backend errors
michaeldwan May 14, 2025
238c702
fix test for connection refused registry
michaeldwan May 15, 2025
ef44dd4
fix assertions for both dev and CI
michaeldwan May 15, 2025
e75dd82
move user info logic off command, share with api
michaeldwan May 15, 2025
e23da3a
move Apt & Tar funcs off command
michaeldwan May 15, 2025
6b8a1da
lint fixes
michaeldwan May 15, 2025
0d9e18e
hack mockcommand to fake tar scripts for tests
michaeldwan May 15, 2025
238d053
fix for apt packages not passing to monobase apt.sh
michaeldwan May 15, 2025
1255a5f
return new client if env var present
michaeldwan May 15, 2025
0d597ac
import buildkit client, add ImageBuild to api client
michaeldwan May 15, 2025
bb04bef
container run, start, stop
michaeldwan May 16, 2025
2576317
run integration tests for both docker clients
michaeldwan May 16, 2025
a8d36cc
stop failing fast on integration tests
michaeldwan May 16, 2025
a670b56
lint fixes
michaeldwan May 16, 2025
633cf03
handle cache, contexts, timestamps, and epoch build opts
michaeldwan May 16, 2025
5228a08
Merge branch 'main' into md/docker-api-client-1
michaeldwan May 16, 2025
b910ed4
fix hang when an error occurs building the solve graph
michaeldwan May 16, 2025
95e6eb6
buildx secrets, integration test for secrets
michaeldwan May 16, 2025
a0fe3d1
mod tidy
michaeldwan May 16, 2025
9ea5439
lint fixes
michaeldwan May 16, 2025
13a7e11
Merge branch 'md/docker-api-client-1' of github.com:replicate/cog int…
michaeldwan May 16, 2025
a7f01e9
format fix
michaeldwan May 16, 2025
abcd317
fix race in mock docker registry port
michaeldwan May 16, 2025
918155a
Merge branch 'main' into md/docker-api-client-1
michaeldwan May 16, 2025
be3c83b
integration test for secrets
michaeldwan May 16, 2025
6be52c4
move credentials logic off command.Command
michaeldwan May 16, 2025
33559ae
move CreateTarFile & CreateAptTarFile to helpers
michaeldwan May 16, 2025
b8275a7
error helpers
michaeldwan May 16, 2025
f2dfae4
more docker integration tests
michaeldwan May 16, 2025
9246b18
Update go.mod
michaeldwan May 16, 2025
9e51b89
fix for merge flub and correct new client func name
michaeldwan May 16, 2025
2639c32
remove some code that's only used in the sdk client
michaeldwan May 16, 2025
b37e789
Merge branch 'md/docker-sdk-client-prep' into md/docker-api-client-1
michaeldwan May 16, 2025
59d8a73
lint fix
michaeldwan May 16, 2025
a4b5d2a
remove debug prints
michaeldwan May 16, 2025
5c43f6c
bring back auto remove
michaeldwan May 16, 2025
af73d3d
fix comments
michaeldwan May 16, 2025
74287d1
set env var so subtests pickup the right client
michaeldwan May 17, 2025
c2be771
Merge branch 'main' into md/docker-api-client-1
michaeldwan May 19, 2025
7445220
Merge branch 'main' into md/docker-api-client-1
michaeldwan May 19, 2025
7579469
Merge branch 'main' into md/docker-api-client-1
michaeldwan May 20, 2025
1781f32
fix conflicts
michaeldwan May 21, 2025
cf167ab
fix merge issue
michaeldwan May 21, 2025
59efcf0
hack to pass required checks
michaeldwan May 21, 2025
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
8 changes: 8 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
matrix:
# https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources
platform: [ubuntu-latest, macos-latest]
new_docker_api_client: [true, false]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
Expand All @@ -82,6 +83,8 @@ jobs:
run: make cog
- name: Test
run: make test-go
env:
COG_DOCKER_SDK_CLIENT: ${{ matrix.new_docker_api_client }}

test-python:
name: "Test Python ${{ matrix.python-version }} + Pydantic v${{ matrix.pydantic }}"
Expand Down Expand Up @@ -121,6 +124,10 @@ jobs:
name: "Test integration"
needs: build-python
runs-on: ubuntu-latest-16-cores
strategy:
fail-fast: false
matrix:
new_docker_api_client: [true, false]
timeout-minutes: 25
steps:
- uses: actions/checkout@v4
Expand All @@ -146,6 +153,7 @@ jobs:
run: make test-integration
env:
R8_COGLET_VERSION: coglet==0.1.0-alpha17
COG_DOCKER_SDK_CLIENT: ${{ matrix.new_docker_api_client }}

release:
name: "Release"
Expand Down
37 changes: 32 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,28 @@ require (
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/mattn/go-isatty v0.0.20
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/buildkit v0.21.1
github.com/moby/term v0.5.2
github.com/opencontainers/image-spec v1.1.1
github.com/pkg/errors v0.9.1
github.com/replicate/go v0.0.0-20250205165008-b772d7cd506b
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.37.0
github.com/testcontainers/testcontainers-go/modules/registry v0.37.0
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
github.com/vbauerster/mpb/v8 v8.9.1
github.com/vincent-petithory/dataurl v1.0.0
github.com/xeipuuv/gojsonschema v1.2.0
github.com/xeonx/timeago v1.0.0-rc5
golang.org/x/crypto v0.37.0
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
golang.org/x/sync v0.14.0
golang.org/x/sys v0.33.0
golang.org/x/term v0.31.0
google.golang.org/grpc v1.71.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
sigs.k8s.io/yaml v1.4.0
Expand All @@ -44,6 +50,7 @@ require (
dario.cat/mergo v1.0.1 // indirect
github.com/4meepo/tagalign v1.4.2 // indirect
github.com/Abirdcfly/dupword v0.1.3 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
github.com/Antonboom/errname v1.0.0 // indirect
github.com/Antonboom/nilnil v1.0.1 // indirect
github.com/Antonboom/testifylint v1.5.2 // indirect
Expand Down Expand Up @@ -89,9 +96,17 @@ require (
github.com/charithe/durationcheck v0.0.10 // indirect
github.com/chavacava/garif v0.1.0 // indirect
github.com/ckaznocha/intrange v0.3.0 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/containerd/containerd/api v1.8.0 // indirect
github.com/containerd/containerd/v2 v2.0.4 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/platforms v1.0.0-rc.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/curioswitch/go-reassign v0.3.0 // indirect
github.com/daixiang0/gci v0.13.5 // indirect
Expand Down Expand Up @@ -130,6 +145,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
github.com/golangci/go-printf-func-name v0.1.0 // indirect
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
Expand All @@ -147,9 +163,12 @@ require (
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/in-toto/in-toto-golang v0.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/yaml v0.3.1 // indirect
github.com/jgautheron/goconst v1.7.1 // indirect
Expand Down Expand Up @@ -182,9 +201,11 @@ require (
github.com/mgechev/revive v1.7.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/go-archive v0.1.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/signal v0.7.1 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
Expand All @@ -197,10 +218,9 @@ require (
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand All @@ -223,7 +243,9 @@ require (
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/securego/gosec/v2 v2.22.2 // indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/shirou/gopsutil/v4 v4.25.2 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sivchari/containedctx v1.0.3 // indirect
Expand All @@ -246,6 +268,9 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
github.com/tonistiigi/fsutil v0.0.0-20250410151801-5b74a7ad7583 // indirect
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
github.com/ultraware/funlen v0.2.0 // indirect
github.com/ultraware/whitespace v0.2.0 // indirect
github.com/uudashr/gocognit v1.2.0 // indirect
Expand All @@ -262,6 +287,8 @@ require (
go-simpler.org/musttag v0.13.0 // indirect
go-simpler.org/sloglint v0.9.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
Expand All @@ -272,14 +299,14 @@ require (
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
google.golang.org/grpc v1.71.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gotest.tools/gotestsum v1.12.2 // indirect
honnef.co/go/tools v0.6.1 // indirect
Expand Down
Loading
Loading