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.

Sign up for GitHub

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

Jump to bottom

fix: disable compose_warning_logs if PODMAN_COMPOSE_WARNING_LOGS=false #23442

Merged
merged 1 commit into from
Jul 30, 2024
Merged

fix: disable compose_warning_logs if PODMAN_COMPOSE_WARNING_LOGS=false #23442

merged 1 commit into from
Jul 30, 2024

Conversation

legobeat
Copy link

@legobeat legobeat commented Jul 30, 2024 •
edited
Loading

Also adds an alias COMPOSE_WARNING_LOGS, which is parsed as fallback if PODMAN_COMPOSE_WARNING_LOGS is not defined.

If neither is defined, previous behavior is retained.

Does this PR introduce a user-facing change?

Respect the PODMAN_COMPOSE_WARNING_LOGS environment variable, which is equivalent to engines.compose_warning_logs in containers.conf.

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note labels Jul 30, 2024
@legobeat legobeat marked this pull request as ready for review July 30, 2024 03:47
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 30, 2024
This was referenced Jul 30, 2024
Closed
Merged
@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch 2 times, most recently from 1217241 to 976322a Compare July 30, 2024 04:05
@legobeat legobeat changed the title fix: disable compose-warning-logs if PODMAN_COMPOSE_WARNING_LOGS=false fix: disable compose_warning_logs if PODMAN_COMPOSE_WARNING_LOGS=false Jul 30, 2024
Luap99
Luap99 requested changes Jul 30, 2024
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash your commits into one and make sure to add your sign-off line: https://github.com/containers/podman/blob/main/CONTRIBUTING.md#sign-your-prs

And don't put Fixes ... as the commit title, this should go in the body not title.

cmd/podman/compose.go Outdated Show resolved Hide resolved
@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch from a98befa to 2d78a03 Compare July 30, 2024 09:13
@legobeat
Copy link
Author

Please squash your commits into one and make sure to add your sign-off line: https://github.com/containers/podman/blob/main/CONTRIBUTING.md#sign-your-prs

And don't put Fixes ... as the commit title, this should go in the body not title.

Done and done.

@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch 3 times, most recently from 3e4c1aa to 48428f5 Compare July 30, 2024 09:50
@legobeat

This comment was marked as outdated.

Sign in to view
@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch 2 times, most recently from 1451168 to a22bd8d Compare July 30, 2024 10:25
@legobeat legobeat requested a review from Luap99 July 30, 2024 10:26
Luap99
Luap99 reviewed Jul 30, 2024
View reviewed changes
test/compose/test-compose Outdated Show resolved Hide resolved
@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch 2 times, most recently from 8c9af2f to 483efd7 Compare July 30, 2024 12:00
Disable compose-warning-logs if PODMAN_COMPOSE_WARNING_LOGS=false
cfac059 
Fixes: e62c928 ("Make podman-compose refer to podman-compose(1) when using an external provider")

- test: add coverage for PODMAN_COMPOSE_WARNING_LOGS

Signed-off-by: Petter Mikkelsen <[email protected]>
@legobeat legobeat force-pushed the compose-warning-logs-env-conf branch from 483efd7 to cfac059 Compare July 30, 2024 12:08
@legobeat
Copy link
Author

I can't seem to replicate this CI error: https://github.com/containers/podman/pull/23442/checks?check_run_id=28101834835

@legobeat legobeat requested a review from Luap99 July 30, 2024 13:20
@rhatdan
Copy link
Member

rhatdan commented Jul 30, 2024

LGTM

Luap99
Luap99 approved these changes Jul 30, 2024
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
thanks

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: legobeat, Luap99

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit d382680 into containers:main Jul 30, 2024
83 checks passed
@legobeat
Copy link
Author

legobeat commented Aug 2, 2024

Thank you for helpful review and timely merge!

@shuckc shuckc mentioned this pull request Sep 10, 2024
Closed
@BlueskyFR
Copy link

BlueskyFR commented Sep 16, 2024 •
edited
Loading

When is this gonna be released please?

@Luap99 Luap99 mentioned this pull request Sep 16, 2024
Closed
@rhatdan
Copy link
Member

rhatdan commented Sep 16, 2024

We tend to release once every two months.

@legobeat legobeat deleted the compose-warning-logs-env-conf branch September 17, 2024 21:07
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Dec 17, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Dec 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Luap99 Luap99 Luap99 approved these changes

Assignees

@Luap99 Luap99

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

PODMAN_COMPOSE_WARNING_LOGS is not respected
4 participants
@legobeat @rhatdan @BlueskyFR @Luap99