Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8de48e9
chore(deps): bump github.com/moby/buildkit from 0.13.1 to 0.13.2 (#3145)
dependabot[bot] May 6, 2024
0d223e0
deps: bump github.com/moby/buildkit and github.com/docker/docker (#3242)
aaron-prindle Jul 8, 2024
0a59d55
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 156815908f…
SasSwart Oct 22, 2024
dc2f916
chore(deps): bump github.com/moby/buildkit from v0.14.1 to v0.15.0-rc1
SasSwart Oct 22, 2024
27a20ae
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 2d69a25253…
SasSwart Oct 22, 2024
353d955
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 93823870f
SasSwart Oct 22, 2024
aff2f57
chore(deps): bump github.com/moby/buildkit from v0.14.1 to a08a9b64d
SasSwart Oct 22, 2024
d44e078
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 76b7b049c
SasSwart Oct 22, 2024
acd5ee9
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 555979d2c
SasSwart Oct 22, 2024
b70f0cc
chore(deps): bump and fix github.com/moby/buildkit from v0.14.1 to 2c…
SasSwart Oct 22, 2024
bc49c72
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 037376945
SasSwart Oct 22, 2024
17f3e5b
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 8bcc375e1
SasSwart Oct 22, 2024
0a82de0
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 8397d0b9f
SasSwart Oct 22, 2024
9e88666
chore(deps): bump github.com/moby/buildkit from v0.14.1 to 1f3eab8c5
SasSwart Oct 22, 2024
1819131
chore(deps): slim down to a failing test for reproducibility
SasSwart Oct 22, 2024
5503712
chore(deps): bump github.com/moby/buildkit from v0.14.1 to v0.16.0
SasSwart Oct 22, 2024
8b9dfaa
chore(deps): test against the latest version of docker
SasSwart Oct 22, 2024
3e7fc57
chore(deps): test against the latest version of docker
SasSwart Oct 22, 2024
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
30 changes: 30 additions & 0 deletions .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,41 @@ jobs:
remove-android: 'true'
remove-dotnet: 'true'
remove-haskell: 'true'
- name: Upgrade docker
run: |
sudo apt-get remove -y docker docker-engine docker.io containerd runc docker-doc docker-compose docker-compose-v2 podman-docker
sudo apt-get update -y
sudo apt-get install -y \
ca-certificates \
curl \
gnupg \
lsb-release

# Add Docker's official GPG key
sudo install -m 0755 -d /etc/apt/keyrings
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg

echo \
"deb [arch=$(dpkg --print-architecture) \
signed-by=/etc/apt/keyrings/docker.gpg] \
https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null

# Update the package list again with the new repository
sudo apt-get update -y

# Install the latest version of Docker Engine, CLI, and containerd
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin

- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.22'
- uses: actions/checkout@b0e28b5ac45a892f91e7d036f8200cf5ed489415 # v3
- uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v1
with:
version: v0.17.1

- run: make install-container-diff k3s-setup
- run: make ${{ matrix.make-target }}
26 changes: 12 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240419161514-af205d85bb44
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
github.com/containerd/cgroups v1.1.0 // indirect
github.com/docker/docker v26.1.5+incompatible
github.com/docker/docker v27.3.1+incompatible
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-git/go-git/v5 v5.12.0
github.com/golang/mock v1.6.0
Expand All @@ -21,7 +21,7 @@ require (
github.com/google/go-github v17.0.0+incompatible
github.com/google/slowjam v1.1.1
github.com/minio/highwayhash v1.0.2
github.com/moby/buildkit v0.13.1
github.com/moby/buildkit v0.16.0
github.com/otiai10/copy v1.14.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
Expand All @@ -35,7 +35,7 @@ require (

require (
github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22
github.com/containerd/containerd v1.7.19
github.com/containerd/containerd v1.7.21
github.com/twpayne/go-vfs/v5 v5.0.4
)

Expand Down Expand Up @@ -78,7 +78,7 @@ require (
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/cli v27.0.3+incompatible // indirect
github.com/docker/cli v27.2.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.5.0 // indirect
Expand Down Expand Up @@ -107,9 +107,9 @@ require (
github.com/moby/locker v1.0.1 // indirect
github.com/moby/patternmatcher v0.6.0
github.com/moby/sys/mount v0.3.3 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/signal v0.7.0
github.com/moby/sys/signal v0.7.1
github.com/moby/sys/symlink v0.2.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
Expand All @@ -126,9 +126,9 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/sys v0.22.0
golang.org/x/text v0.15.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.175.0
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
Expand All @@ -149,23 +149,19 @@ require (
github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.27.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.23.4 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/containerd/cgroups/v3 v3.0.2 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/ttrpc v1.2.5 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/containerd/typeurl/v2 v2.2.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/subcommands v1.2.0 // indirect
Expand All @@ -174,7 +170,8 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
Expand All @@ -184,6 +181,7 @@ require (
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/viper v1.18.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
github.com/toqueteos/webbrowser v1.2.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
Expand Down
Loading
Loading