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

WIP: Add ability to list images on push #4660

Closed
wants to merge 1 commit into from
Closed

WIP: Add ability to list images on push #4660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@ require (
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
)

replace github.com/containers/storage => github.com/saschagrunert/storage v1.12.3-0.20200225133936-b4f34141d69e
19 changes: 19 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,25 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 h1:2c1EFnZHIPCW8qKWgHMH/fX2PkSabFc5mrVzfUNdg5U=
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
github.com/saschagrunert/storage v1.12.3-0.20200210095711-e760119c4258 h1:iGKGMWqU1zwxlSstCWbJdyka/vLngJfyk+9EOj/1zII=
github.com/saschagrunert/storage v1.12.3-0.20200210095711-e760119c4258/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200210135817-4d931f858050 h1:Uy+tPmj3uJaOh7BWGobSr9154CCgAO+en1qdFh4/KNU=
github.com/saschagrunert/storage v1.12.3-0.20200210135817-4d931f858050/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200211085627-66295e35a07d h1:Mv4SDxIB+uJUB1wuVtspU0HUOLSQvaV/GFqjjwRMKS0=
github.com/saschagrunert/storage v1.12.3-0.20200211085627-66295e35a07d/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200211090017-75375da2a194 h1:D0Dj3OleEsBhdICzyHG8ALxvf+7qapCT1x3BNRkTiSs=
github.com/saschagrunert/storage v1.12.3-0.20200211090017-75375da2a194/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200211092915-485fad532f1b h1:FQr/wMBmEDG6X6dzL1oT6dkUfTaAKIFl9HgtKvqGNmk=
github.com/saschagrunert/storage v1.12.3-0.20200211092915-485fad532f1b/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200212083334-632bd41bbbe6 h1:PLfqsUujUizh3OHFaicll+jLobcxu3xTGpZfcfAKO8o=
github.com/saschagrunert/storage v1.12.3-0.20200212083334-632bd41bbbe6/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200212083441-9fef53d70652 h1:tWV38lp3QIiVgagqcQpfVwooOpYnq/aH90Mm87JEHWc=
github.com/saschagrunert/storage v1.12.3-0.20200212083441-9fef53d70652/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200225133615-0f950a484f27 h1:H6lwkveMoYj4AJIh1aOqCstUM8TiGrjluHuv/BD9r3E=
github.com/saschagrunert/storage v1.12.3-0.20200225133615-0f950a484f27/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/saschagrunert/storage v1.12.3-0.20200225133936-b4f34141d69e h1:aAPWr45ev3v5eTCLeEZV4lMiZMysJrIN9PXxuo1vnww=
github.com/saschagrunert/storage v1.12.3-0.20200225133936-b4f34141d69e/go.mod h1:zhvjIIl/fR6wt/lgqQAC+xanHQ+8gUQ0GBVeXYN81qI=
github.com/seccomp/containers-golang v0.0.0-20180629143253-cdfdaa7543f4 h1:rOG9oHVIndNR14f3HRyBy9UPQYmIPniWqTU1TDdHhq4=
github.com/seccomp/containers-golang v0.0.0-20180629143253-cdfdaa7543f4/go.mod h1:f/98/SnvAzhAEFQJ3u836FePXvcbE8BS0YGMQNn4mhA=
github.com/seccomp/containers-golang v0.0.0-20190312124753-8ca8945ccf5f h1:OtU/w6sBKmXYaw2KEODxjcYi3oPSyyslhgGFgIJVGAI=
github.com/seccomp/containers-golang v0.0.0-20190312124753-8ca8945ccf5f/go.mod h1:f/98/SnvAzhAEFQJ3u836FePXvcbE8BS0YGMQNn4mhA=
Expand Down
4 changes: 2 additions & 2 deletions libpod/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ func (r *storageService) GetMountpoint(id string) (string, error) {
}
return "", err
}
layer, err := r.store.Layer(container.LayerID)
mountPoint, err := r.store.LayerMountpoint(container.LayerID)
if err != nil {
return "", err
}

return layer.MountPoint, nil
return mountPoint, nil
}

func (r *storageService) GetWorkDir(id string) (string, error) {
Expand Down
6 changes: 3 additions & 3 deletions test/system/050-stop.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ load helpers

# Confirm that container is stopped
run_podman inspect --format '{{.State.Status}} {{.State.ExitCode}}' $cid
is "$output" "exited \+137" "Status and exit code of stopped container"
is "$output" ".* 137" "Status and exit code of stopped container"

# The initial SIGTERM is ignored, so this operation should take
# exactly 10 seconds. Give it some leeway.
Expand Down Expand Up @@ -57,8 +57,8 @@ load helpers

# The 'stop' command should return almost instantaneously
delta_t=$(( $t1 - $t0 ))
[ $delta_t -le 2 ] ||\
die "podman stop: took too long ($delta_t seconds; expected <= 2)"
[ $delta_t -le 3 ] ||\
die "podman stop: took too long ($delta_t seconds; expected <= 3)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes here seem unrelated and should be in a separate commits explaining why they're needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I have no idea, do you saw this in other PRs failing as well? I constantly had a higher delay in that test... 🤷‍♂️


run_podman rm $cid
done
Expand Down
11 changes: 7 additions & 4 deletions vendor/github.com/containers/storage/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/storage/VERSION
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/containers/storage/containers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/containers/storage/images.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/storage/images_ffjson.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions vendor/github.com/containers/storage/layers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading