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.

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

healthcheck: Add support for --start-interval and bump imagebuilder to v1.2.8 #5472

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

flouthoc
Copy link
Collaborator

healthcheck: Add support for --start-interval and bump imagebuilder to v1.2.8

Docker now supports --start-interval, start interval
is the time between health checks during the start period.

Ref: https://docs.docker.com/reference/dockerfile/#healthcheck

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

healthcheck: Add support for --start-interval and bump`imagebuilder to v1.2.8

Closes: containers/podman#21701

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Docker now supports `--start-interval`, start interval
is the time between health checks during the start period.

Ref: https://docs.docker.com/reference/dockerfile/#healthcheck

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Copy link
Contributor

openshift-ci bot commented Apr 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@flouthoc
Copy link
Collaborator Author

@Luap99 I think CI is asking me to bump go version in go.mod file due to some of new dependency, for me the binary builds fine with go 1.20, any idea how can i prevent the version bump ?

The diff which CI is asking me to apply

 M go.mod
diff --git a/go.mod b/go.mod
index e8940aa..020af6d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/containers/buildah
 
-go 1.20
+go 1.21
+
+toolchain go1.22.2
 
 require (
 	github.com/containerd/containerd v1.7.13

@Luap99
Copy link
Member

Luap99 commented Apr 11, 2024

github.com/fsouza/go-dockerclient was bumped to go 1.21 so no there is no way to avoid bumping the go version to update this unless you downgrade this dep again.

Anyhow go 1.20 is EOL so updating to 1.21 is possible but we first need to figure out how to deal with the toolchain line because that default behavior is ridiculous. ref: https://github.com/containers/podman/blob/d65f3996dd263eb875be623d1164ce7e9cbdc3bf/go.mod#L6

@flouthoc
Copy link
Collaborator Author

flouthoc commented Apr 11, 2024

github.com/fsouza/go-dockerclient was bumped to go 1.21 so no there is no way to avoid bumping the go version to update this unless you downgrade this dep again.

Anyhow go 1.20 is EOL so updating to 1.21 is possible but we first need to figure out how to deal with the toolchain line because that default behavior is ridiculous. ref: https://github.com/containers/podman/blob/d65f3996dd263eb875be623d1164ce7e9cbdc3bf/go.mod#L6

@Luap99 Okay I'll keep this PR on hold till then, I don't want to bump buildah to v1.21 before things on podman is sorted out. Pls let me know once podman toolchain issue is resolved since I am not sure when it is gonna be resolved.

@flouthoc
Copy link
Collaborator Author

Tagging @nalind for info.

@flouthoc
Copy link
Collaborator Author

@Luap99 Could you take a look at 7a36a70 and let me know if it looks good then I can add same commit to this PR

@Luap99
Copy link
Member

Luap99 commented Apr 16, 2024

@Luap99 Could you take a look at 7a36a70 and let me know if it looks good then I can add same commit to this PR

No, that will not work as it will break all renovate PRs.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2024
@openshift-merge-robot
Copy link
Collaborator

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@flouthoc
Copy link
Collaborator Author

I'll rebase this when the issue with golang which is discussed above gets resolved.

@Luap99
Copy link
Member

Luap99 commented May 13, 2024

I'll rebase this when the issue with golang which is discussed above gets resolved.

You should be able to rebase now I think.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to build container with --start-interval healthcheck option
3 participants