chore: Bump github.com/containers/podman from v4 to v5 #348
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rpoisel
force-pushed
the
dev-upgrade-podman-from-v4-to-v5
branch
2 times, most recently
from
7ae088f to
61977b1
Compare
Signed-off-by: Rainer Poisel <[email protected]>
rpoisel
force-pushed
the
dev-upgrade-podman-from-v4-to-v5
branch
from
61977b1 to
75c5800
Compare
Collaborator
|
@rpoisel could you pull in main then i should be able to run the github actions and get this in |
|
I have rebased the changes from @rpoisel, updated to podman v5.5.0, re-used the version variable for the ref and also changed the job names in the Workflow file from v4 to v5 to be consistent. I can open my own PR or otherwise, here's the patch: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2487336..329a366 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -8,11 +8,11 @@ on:
env:
CGO_ENABLED: 0
- PODMAN_VER: v5.4.2
+ PODMAN_VER: v5.5.0
jobs:
- build-podman-v4:
+ build-podman-v5:
env:
CGO_ENABLED: 1 # CGO is required for podman
runs-on: ubuntu-latest
@@ -30,7 +30,7 @@ jobs:
if: steps.cache-podman-bin.outputs.cache-hit != 'true'
with:
repository: containers/podman
- ref: v5.4.2
+ ref: ${{ env.PODMAN_VER }}
- uses: actions/setup-go@v4
if: steps.cache-podman-bin.outputs.cache-hit != 'true'
@@ -54,7 +54,7 @@ jobs:
if: steps.cache-podman-bin.outputs.cache-hit != 'true'
run: sudo apt install -y libsystemd-dev libseccomp-dev pkg-config golang-github-proglottis-gpgme-dev
- - name: Build podman v4
+ - name: Build podman v5
if: steps.cache-podman-bin.outputs.cache-hit != 'true'
run: make binariesAlso, the GitHub Actions ran fine on my repository after all the changes have been applied. |
rpoisel
force-pushed
the
dev-upgrade-podman-from-v4-to-v5
branch
3 times, most recently
from
79122a1 to
ac8c735
Compare
Signed-off-by: Rainer Poisel <[email protected]>
rpoisel
force-pushed
the
dev-upgrade-podman-from-v4-to-v5
branch
from
ac8c735 to
c952ce9
Compare
Author
Thanks for keeping an eye on this and for trying to update the Podman build dependency to the latest version. @Crosswind, have you tried to update the actual go dependencies as well? go get github.com/containers/podman/[email protected]
go mod tidy
go mod vendorAfter performing the upgrade, I was unable to build fetchit: podman build . --file Dockerfile --tag quay.io/fetchit/fetchit-amd:latest
...
go build -mod=vendor -tags 'include_gcs include_oss containers_image_openpgp gssapi providerless netgo osusergo exclude_graphdriver_btrfs' -ldflags "-X k8s.io/component-base/version.gitMajor=0 -X k8s.io/component-base/version.gitMajor=0 -X k8s.io/component-base/version.gitMinor=0 -X k8s.io/component-base/version.gitVersion=v0.0.0 -X k8s.io/component-base/version.gitTreeState=clean -X k8s.io/client-go/pkg/version.gitMajor=0 -X k8s.io/client-go/pkg/version.gitMinor=0 -X k8s.io/client-go/pkg/version.gitVersion=v0.0.0 -X k8s.io/client-go/pkg/version.gitTreeState=clean " -o '_output/bin/linux_amd64/fetchit' github.com/containers/fetchit/cmd/fetchit
# github.com/sigstore/sigstore-go/pkg/root
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:33:26: sc.signingConfig.GetCaUrl undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method GetCaUrl)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:37:26: sc.signingConfig.GetOidcUrl undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method GetOidcUrl)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:41:26: sc.signingConfig.GetTlogUrls undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method GetTlogUrls)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:45:9: cannot use sc.signingConfig.GetTsaUrls() (value of type []*"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".Service) as []string value in return statement
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:49:19: sc.signingConfig.CaUrl undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method CaUrl)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:54:19: sc.signingConfig.OidcUrl undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method OidcUrl)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:59:19: sc.signingConfig.TlogUrls undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method TlogUrls)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:64:54: sc.signingConfig.TlogUrls undefined (type *"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".SigningConfig has no field or method TlogUrls)
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:69:29: cannot use tsaURLs (variable of type []string) as []*"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".Service value in assignment
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:74:62: cannot use tsaURLs (variable of type []string) as []*"github.com/sigstore/protobuf-specs/gen/pb-go/trustroot/v1".Service value in argument to append
vendor/github.com/sigstore/sigstore-go/pkg/root/signing_config.go:74:62: too many errorsUpgrading all sigstore dependencies to the latest version fixes the compilation errors: go get github.com/sigstore/...
go mod tidy
go mod vendor
make _build_localHowever, this only works with go version 1.24. The Therefore, I just edited Let's focus on upgrading to v5.5.0 in a later PR as soon as the build images support go version 1.24, I'd suggest. |
|
@rpoisel here’s my build when upgrading to v5.5.0: https://github.com/Crosswind/fetchit/actions/runs/15344060475/job/43176306430 In any case, I agree that we don’t have to crunch all the changes in here. If sticking with 5.4.2 gets us moving quicker, let’s go for it. Edit: No, I haven’t ran the steps you mentioned. My proficiency with go is very low so I just took your chances and thought this was good sufficient. |
|
@cooktheryan Could you approve the pipeline run? And, if successful, get this merged? I am not using fetchit yet but waiting for these things to be merged. No idea if using the current version of fetchit with podman v5, etc. |
Collaborator
|
launching pipeline now. WIll take a look to see if anything jumps out |
Collaborator
|
@rpoisel could you update the fedora image version. After that i think we are good |
Signed-off-by: Rainer Poisel <[email protected]>
rpoisel
force-pushed
the
dev-upgrade-podman-from-v4-to-v5
branch
from
e30a081 to
dec41fe
Compare
Author
Hi Ryan, thanks for your support! I just changed the docker base image from Fedora 36 to 42. Please let me know if you need any other changes in this PR. |
Collaborator
|
I think we will need to update crun |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I just completed the Quick Start example successfully with the locally built image based on this version.