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

Quadlet Container: Add support for EnvironmentFile and EnvironmentHost #16953

Merged

Conversation

ygalblum
Copy link
Contributor

Add the new keys to the supported keys list for the Container group Pass the list of EnvironmentFile values while maintaining the order Quadlet e2e test framework: Add support for checking regex in Podman args Add relevant tests
Update man

Signed-off-by: Ygal Blum [email protected]

Does this PR introduce a user-facing change?

No since Quadlet was not yet released

None

Resolves: #16730

@rhatdan
Copy link
Member

rhatdan commented Dec 29, 2022

LGTM
@vrothberg @alexlarsson PTAL

@ygalblum ygalblum force-pushed the quadlet-container-env branch from f859d30 to ecd042f Compare January 1, 2023 06:48
@ygalblum ygalblum force-pushed the quadlet-container-env branch from ecd042f to e3d12d3 Compare January 3, 2023 11:04
@@ -0,0 +1,9 @@
## assert-podman-final-args localhost/imagename
## assert-podman-args --env-file /opt/env/abs-1 --env-file /opt/env/abs-2
## assert-podman-args-regex --env-file /tmp/podman_test.*/quadlet/rel-1
Copy link
Contributor

@alexlarsson alexlarsson Jan 3, 2023

Choose a reason for hiding this comment

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

Are we sure this is the tmpdir always used? Maybe /.*/podman_test.*/quadlet/rel-1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. The system tmpdir might not be /tmp. Fixed

Add the new keys to the supported keys list for the Container group
Pass the list of EnvironmentFile values while maintaining the order
Quadlet e2e test framework: Add support for checking regex in Podman args
Add relevant tests
Update man

Signed-off-by: Ygal Blum <[email protected]>
@ygalblum ygalblum force-pushed the quadlet-container-env branch from e3d12d3 to 347d537 Compare January 3, 2023 11:14
@alexlarsson
Copy link
Contributor

lgtm

@ygalblum
Copy link
Contributor Author

ygalblum commented Jan 3, 2023

@containers/podman-maintainers can someone please rerun the flaked test? The failure is not related to the change

@rhatdan
Copy link
Member

rhatdan commented Jan 3, 2023

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, ygalblum

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 Jan 3, 2023
@openshift-merge-robot openshift-merge-robot merged commit 74e8654 into containers:main Jan 3, 2023
@ygalblum ygalblum deleted the quadlet-container-env branch January 3, 2023 14:15
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 16, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add EnvironmentFile support (Quadlet)
5 participants