opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 19:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source 
[v5.5] machine init: fix tls check
This commit is contained in:
Paul Holzinger
2025-06-24 15:49:06 +02:00
committed by GitHub
parent 05408b8149 1569c20982
commit cfdd5645a2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/machine/ocipull/ociartifact.go
View File

@ -224,7 +224,7 @@ func (o *OCIArtifactDisk) getDestArtifact() (types.ImageReference, digest.Digest
} }
fmt.Printf("Looking up Podman Machine image at %s to create VM\n", imgRef.DockerReference()) fmt.Printf("Looking up Podman Machine image at %s to create VM\n", imgRef.DockerReference())
sysCtx := &types.SystemContext{ sysCtx := &types.SystemContext{
DockerInsecureSkipTLSVerify: types.NewOptionalBool(!o.pullOptions.TLSVerify), DockerInsecureSkipTLSVerify: o.pullOptions.SkipTLSVerify,
} }
imgSrc, err := imgRef.NewImageSource(o.ctx, sysCtx) imgSrc, err := imgRef.NewImageSource(o.ctx, sysCtx)
if err != nil { if err != nil {

6
pkg/machine/ocipull/pull.go
View File

@ -21,8 +21,8 @@ import (
// PullOptions includes data to alter certain knobs when pulling a source // PullOptions includes data to alter certain knobs when pulling a source
// image. // image.
type PullOptions struct { type PullOptions struct {
// Require HTTPS and verify certificates when accessing the registry. // Skip TLS verification when accessing the registry.
TLSVerify bool SkipTLSVerify types.OptionalBool
// [username[:password] to use when connecting to the registry. // [username[:password] to use when connecting to the registry.
Credentials string Credentials string
// Quiet the progress bars when pushing. // Quiet the progress bars when pushing.
@ -46,7 +46,7 @@ func Pull(ctx context.Context, imageInput types.ImageReference, localDestPath *d
} }
sysCtx := &types.SystemContext{ sysCtx := &types.SystemContext{
DockerInsecureSkipTLSVerify: types.NewOptionalBool(!options.TLSVerify), DockerInsecureSkipTLSVerify: options.SkipTLSVerify,
} }
if options.Credentials != "" { if options.Credentials != "" {
authConf, err := parse.AuthConfig(options.Credentials) authConf, err := parse.AuthConfig(options.Credentials)