mirror of
https://github.com/containers/podman.git
synced 2025-09-10 15:46:07 +08:00
@ -144,8 +144,6 @@ func StringToType(name string) (Type, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// StringToStatus converts a string to an Event Status
|
// StringToStatus converts a string to an Event Status
|
||||||
// TODO if we add more events, we might consider a go-generator to
|
|
||||||
// create the switch statement
|
|
||||||
func StringToStatus(name string) (Status, error) {
|
func StringToStatus(name string) (Status, error) {
|
||||||
switch name {
|
switch name {
|
||||||
case Attach.String():
|
case Attach.String():
|
||||||
|
@ -53,7 +53,7 @@ func (p *Pod) GetPodPidInformation(descriptors []string) ([]string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: psgo returns a [][]string to give users the ability to apply
|
// NOTE: psgo returns a [][]string to give users the ability to apply
|
||||||
// filters on the data. We need to change the API here to return
|
// filters on the data. We need to change the API here to return
|
||||||
// a [][]string if we want to make use of filtering.
|
// a [][]string if we want to make use of filtering.
|
||||||
opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()}
|
opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()}
|
||||||
|
@ -460,8 +460,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func LoadImages(w http.ResponseWriter, r *http.Request) {
|
func LoadImages(w http.ResponseWriter, r *http.Request) {
|
||||||
// TODO this is basically wrong
|
|
||||||
// TODO ... improve these ^ messages to something useful
|
|
||||||
decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
|
decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
|
||||||
runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
|
runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
|
||||||
|
|
||||||
|
@ -245,8 +245,6 @@ func authConfigsToAuthFile(authConfigs map[string]types.DockerAuthConfig) (strin
|
|||||||
}
|
}
|
||||||
authFilePath := tmpFile.Name()
|
authFilePath := tmpFile.Name()
|
||||||
|
|
||||||
// TODO: It would be nice if c/image could dump the map at once.
|
|
||||||
//
|
|
||||||
// Now use the c/image packages to store the credentials. It's battle
|
// Now use the c/image packages to store the credentials. It's battle
|
||||||
// tested, and we make sure to use the same code as the image backend.
|
// tested, and we make sure to use the same code as the image backend.
|
||||||
sys := types.SystemContext{AuthFilePath: authFilePath}
|
sys := types.SystemContext{AuthFilePath: authFilePath}
|
||||||
|
@ -55,8 +55,6 @@ func CopyFromArchive(ctx context.Context, nameOrID string, path string, reader i
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CopyFromArchiveWithOptions copy files into container
|
// CopyFromArchiveWithOptions copy files into container
|
||||||
//
|
|
||||||
// FIXME: remove this function and make CopyFromArchive accept the option as the last parameter in podman 4.0
|
|
||||||
func CopyFromArchiveWithOptions(ctx context.Context, nameOrID string, path string, reader io.Reader, options *CopyOptions) (entities.ContainerCopyFunc, error) {
|
func CopyFromArchiveWithOptions(ctx context.Context, nameOrID string, path string, reader io.Reader, options *CopyOptions) (entities.ContainerCopyFunc, error) {
|
||||||
conn, err := bindings.GetClient(ctx)
|
conn, err := bindings.GetClient(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -46,7 +46,6 @@ func KubeWithBody(ctx context.Context, body io.Reader, options *KubeOptions) (*e
|
|||||||
params.Set("start", strconv.FormatBool(options.GetStart()))
|
params.Set("start", strconv.FormatBool(options.GetStart()))
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: have a global system context we can pass around (1st argument)
|
|
||||||
header, err := auth.MakeXRegistryAuthHeader(&types.SystemContext{AuthFilePath: options.GetAuthfile()}, options.GetUsername(), options.GetPassword())
|
header, err := auth.MakeXRegistryAuthHeader(&types.SystemContext{AuthFilePath: options.GetAuthfile()}, options.GetUsername(), options.GetPassword())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -80,12 +80,6 @@ function service_cleanup() {
|
|||||||
run_podman logs $cname
|
run_podman logs $cname
|
||||||
is "$output" ".*WAITING.*" "running is waiting for signal"
|
is "$output" ".*WAITING.*" "running is waiting for signal"
|
||||||
|
|
||||||
# Exercise `podman auto-update`.
|
|
||||||
# TODO: this will at least run auto-update code but won't perform an update
|
|
||||||
# since the image didn't change. We need to improve on that and run
|
|
||||||
# an image from a local registry instead.
|
|
||||||
run_podman auto-update
|
|
||||||
|
|
||||||
# All good. Stop service, clean up.
|
# All good. Stop service, clean up.
|
||||||
# Also make sure the service is in the `inactive` state (see #11304).
|
# Also make sure the service is in the `inactive` state (see #11304).
|
||||||
service_cleanup inactive
|
service_cleanup inactive
|
||||||
|
Reference in New Issue
Block a user