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

use wildcards for swid file addition #2163

Merged
merged 1 commit into from
Dec 5, 2023
Merged

use wildcards for swid file addition #2163

merged 1 commit into from
Dec 5, 2023

Conversation

andrewschoen
Copy link
Contributor

This will allow us to add new swid files downstream without needing to modify this file

This will allow us to add new swid files downstream
without needing to modify this file

Signed-off-by: Andrew Schoen <aschoen@ibm.com>
@ktdreyer
Copy link
Member

Thanks. Did you test this?

@andrewschoen
Copy link
Contributor Author

Thanks. Did you test this?

I have not yet. Would this be best to test manually as a patch downstream?

@ktdreyer
Copy link
Member

rhcs.md explains how to build locally with docker (I have to cherry-pick #2011 to use podman)

@guits
Copy link
Collaborator

guits commented Nov 9, 2023

fwiw

# cat Dockerfile
FROM quay.ceph.io/ceph-ci/ceph:main
ADD *.test /var/lib/ceph/

# podman build -t docker.io/guits/ceph:swid .
STEP 1/2: FROM quay.ceph.io/ceph-ci/ceph:main
STEP 2/2: ADD *.test /var/lib/ceph/
--> Using cache e00984db2c25081a893e93dfca904cd6c1b6a26de37e329cb12650162f3c55ed
COMMIT docker.io/guits/ceph:cv-dmcrypt-optim
--> e00984db2c25
Successfully tagged docker.io/guits/ceph:swid
e00984db2c25081a893e93dfca904cd6c1b6a26de37e329cb12650162f3c55ed
# ls *.test
guits2.test  guits.test
# podman run --rm -ti --entrypoint ls docker.io/guits/ceph:swid /var/lib/ceph/guits.test
/var/lib/ceph/guits.test
# podman run --rm -ti --entrypoint ls docker.io/guits/ceph:swid /var/lib/ceph/guits2.test
/var/lib/ceph/guits2.test
#

not sure if there are details specific to downstream build context to verify in addition to that though.

Copy link
Member

@ktdreyer ktdreyer left a comment

Choose a reason for hiding this comment

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

Ok great. Thanks Guillaume.

@deepshikhaaa
Copy link

Can we please get this merged?

@guits guits merged commit e593a3c into main Dec 5, 2023
8 checks passed
@guits guits deleted the wip-swid-wildcard branch December 5, 2023 15:15
@ktdreyer
Copy link
Member

ktdreyer commented Dec 5, 2023

Reef change @ #2175

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants