opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-23 13:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22673 from tnk4on/fix-farm-remote

Browse Source 
Fix podman-remote support for `podman farm build`
This commit is contained in:
openshift-merge-bot[bot]
2024-05-14 13:14:36 +00:00
committed by GitHub
parent 8ae59f8923 3b1c735b67
commit a6aa5c8fcf
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/common/build.go
View File

@ -119,11 +119,14 @@ func DefineBuildFlags(cmd *cobra.Command, buildOpts *BuildFlagsWrapper, isFarmBu
_ = flags.MarkHidden("disable-content-trust") _ = flags.MarkHidden("disable-content-trust")
_ = flags.MarkHidden("sign-by") _ = flags.MarkHidden("sign-by")
_ = flags.MarkHidden("signature-policy") _ = flags.MarkHidden("signature-policy")
_ = flags.MarkHidden("tls-verify")
_ = flags.MarkHidden("compress") _ = flags.MarkHidden("compress")
_ = flags.MarkHidden("output") _ = flags.MarkHidden("output")
_ = flags.MarkHidden("logsplit") _ = flags.MarkHidden("logsplit")
_ = flags.MarkHidden("cw") _ = flags.MarkHidden("cw")
// Support for farm build in podman-remote
if !isFarmBuild {
_ = flags.MarkHidden("tls-verify")
}
} }
if isFarmBuild { if isFarmBuild {
for _, f := range FarmBuildHiddenFlags { for _, f := range FarmBuildHiddenFlags {

4
pkg/domain/infra/tunnel/manifest.go
View File

@ -201,13 +201,13 @@ func (ir *ImageEngine) ManifestPush(ctx context.Context, name, destination strin
// ManifestListClear clears out all instances from a manifest list // ManifestListClear clears out all instances from a manifest list
func (ir *ImageEngine) ManifestListClear(ctx context.Context, name string) (string, error) { func (ir *ImageEngine) ManifestListClear(ctx context.Context, name string) (string, error) {
listContents, err := manifests.InspectListData(ctx, name, &manifests.InspectOptions{}) listContents, err := manifests.InspectListData(ir.ClientCtx, name, &manifests.InspectOptions{})
if err != nil { if err != nil {
return "", err return "", err
} }
for _, instance := range listContents.Manifests { for _, instance := range listContents.Manifests {
if _, err := manifests.Remove(ctx, name, instance.Digest.String(), &manifests.RemoveOptions{}); err != nil { if _, err := manifests.Remove(ir.ClientCtx, name, instance.Digest.String(), &manifests.RemoveOptions{}); err != nil {
return "", err return "", err
} }
} }

7
test/farm/001-farm.bats
View File

@ -116,6 +116,13 @@ EOF
@test "farm - build on farm node only (podman-remote)" { @test "farm - build on farm node only (podman-remote)" {
iname="test-image-5" iname="test-image-5"
# ManifestAdd only
echo "Running test with ManifestAdd only..."
run_podman --remote farm build --authfile $AUTHFILE --tls-verify=false -t $REGISTRY/$iname $FARM_TMPDIR
assert "$output" =~ "Farm \"$FARMNAME\" ready"
# ManifestListClear and ManifestAdd
echo "Running test with ManifestListClear and ManifestAdd..."
run_podman --remote farm build --authfile $AUTHFILE --tls-verify=false -t $REGISTRY/$iname $FARM_TMPDIR run_podman --remote farm build --authfile $AUTHFILE --tls-verify=false -t $REGISTRY/$iname $FARM_TMPDIR
assert "$output" =~ "Farm \"$FARMNAME\" ready" assert "$output" =~ "Farm \"$FARMNAME\" ready"