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

minor update for bootc-image-builder target #367

Merged
merged 2 commits into from
Apr 29, 2024

Conversation

PaulYuuu
Copy link
Contributor

  1. bootc-image-builder target depends on bootc, even the bootc image
    exists in the local storage, it still builds a new one. As we add
    --local in the podman command line, so this commit only check image in
    local storage, will not check remote registry.
  2. DISK_USER and DISK_GROUP are from rfe(bootc-image-builder): Support "--chown" option #299, they are used for bib option
    --chown. However, the current variable name may cause
    misunderstanding, mislead people into thinking it's a user of operation
    system inside disk, so rename them.
    Also, add these 2 variables into the README.

Signed-off-by: Yihuang Yu [email protected]

`bootc-image-builder` target depends on `bootc`, even the bootc image
exists in the local storage, it still builds a new one. As we add
`--local` in the podman command line, so this commit only check image in
local storage, will not check remote registry.

Signed-off-by: Yihuang Yu <[email protected]>
DISK_USER and DISK_GROUP are from containers#299, they are used for bib option
`--chown`. However, the current variable name may cause
misunderstanding, mislead people into thinking it's a user of operation
system inside disk, so rename them.

Also, add these 2 variables into the README.

Signed-off-by: Yihuang Yu <[email protected]>
@PaulYuuu
Copy link
Contributor Author

At first, I planned to check the remote registry together, but considering that the time to pull the image is about the same as build bootc locally, so I only check local image in this PR. the following is my first version.

-bootc-image-builder: bootc
+bootc-image-builder:
+	@if ! podman image exists $(BOOTC_IMAGE); then \
+		if ! podman pull $(BOOTC_IMAGE) &> /dev/null; then \
+			$(MAKE) bootc; \
+		fi \
+	fi

@rhatdan
Copy link
Member

rhatdan commented Apr 29, 2024

LGTM
Waiting to merge until test changes get merged.

@rhatdan rhatdan merged commit 3925281 into containers:main Apr 29, 2024
1 check passed
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.

2 participants