Skip to content
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

test: bump docker API to 1.45 #6914

Merged
merged 4 commits into from
Jun 13, 2024
Merged

test: bump docker API to 1.45 #6914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
837f993
test(TestDockerEngine): overwrite `container` field
DmitriyLewen Jun 13, 2024
51da610
chore(deps): replace testdocker to fork
DmitriyLewen Jun 13, 2024
6b7b282
test: update API version + test cases
DmitriyLewen Jun 13, 2024
98afd9d
chore(deps): bump testdocker
DmitriyLewen Jun 13, 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
Prev Previous commit
Next Next commit
test: update API version + test cases
  • Loading branch information
@DmitriyLewen
DmitriyLewen committed Jun 13, 2024
commit 6b7b2827c6cdb473460925d73bc33d6b1a072e80
3 changes: 1 addition & 2 deletions pkg/fanal/image/daemon/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var imagePaths = map[string]string{

// for Docker
var opt = engine.Option{
APIVersion: "1.38",
APIVersion: "1.45",
ImagePaths: imagePaths,
}

Expand Down Expand Up @@ -167,7 +167,6 @@ func Test_image_ConfigFile(t *testing.T) {
imageName: "alpine:3.11",
want: &v1.ConfigFile{
Architecture: "amd64",
Container: "fb71ddde5f6411a82eb056a9190f0cc1c80d7f77a8509ee90a2054428edb0024",
OS: "linux",
Created: v1.Time{Time: time.Date(2020, 3, 23, 21, 19, 34, 196162891, time.UTC)},
DockerVersion: "18.09.7",
Expand Down
2 changes: 1 addition & 1 deletion pkg/fanal/image/daemon/podman_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func setupPodmanSock(t *testing.T) *httptest.Server {
sockPath := filepath.Join(dir, "podman.sock")

opt := engine.Option{
APIVersion: "1.40",
APIVersion: "1.45",
ImagePaths: map[string]string{
"index.docker.io/library/alpine:3.11": "../../test/testdata/alpine-311.tar.gz",
},
Expand Down
4 changes: 1 addition & 3 deletions pkg/fanal/image/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func setupEngineAndRegistry() (*httptest.Server, *httptest.Server) {
"a187dde48cd2": "../test/testdata/alpine-311.tar.gz",
}
opt := engine.Option{
APIVersion: "1.38",
APIVersion: "1.45",
ImagePaths: imagePaths,
}
te := engine.NewDockerEngine(opt)
Expand Down Expand Up @@ -74,7 +74,6 @@ func TestNewDockerImage(t *testing.T) {
wantRepoTags: []string{"alpine:3.11"},
wantConfigFile: &v1.ConfigFile{
Architecture: "amd64",
Container: "fb71ddde5f6411a82eb056a9190f0cc1c80d7f77a8509ee90a2054428edb0024",
OS: "linux",
Created: v1.Time{Time: time.Date(2020, 3, 23, 21, 19, 34, 196162891, time.UTC)},
DockerVersion: "18.09.7",
Expand Down Expand Up @@ -118,7 +117,6 @@ func TestNewDockerImage(t *testing.T) {
wantRepoTags: []string{"alpine:3.11"},
wantConfigFile: &v1.ConfigFile{
Architecture: "amd64",
Container: "fb71ddde5f6411a82eb056a9190f0cc1c80d7f77a8509ee90a2054428edb0024",
OS: "linux",
Created: v1.Time{Time: time.Date(2020, 3, 23, 21, 19, 34, 196162891, time.UTC)},
DockerVersion: "18.09.7",
Expand Down
Loading