Skip to content

Navigation Menu

Sign in
Sign up

docker build support - #413

Open
lrvick wants to merge 7 commits into
fosslinux:master from
lrvick:master
Open

docker build support #413
lrvick wants to merge 7 commits into
fosslinux:master from
lrvick:master

Conversation

@lrvick

@lrvick lrvick commented Jan 16, 2024

Copy link
Copy Markdown

Support building live-bootstrap as a deterministic docker image.

./rootfs.py --docker

An image can be exported after build with:

docker save local/live-bootstrap -o live-bootstrap.tar

Expected hash as of this PR is:

c3b92d943f5ea55188049fb2c0187c2e10e258ee28216313cf43c2cb5801985c

Comment thread rootfs.py Outdated
Comment thread rootfs.py
with open(config_path, "w", encoding="utf_8") as config:
config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
config.write(f"CHROOT={args.chroot or args.bwrap or args.docker}\n")

@Googulator Googulator Jan 16, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Not something that needs changing in this PR, but in the future, we might want to rename this variable to something more descriptive, like USERSPACE_ONLY (especially if/when I go through with adding the WSL bootstrap mode I'm planning).

lrvick reacted with thumbs up emoji
lrvick requested a review from stikonas January 25, 2024 00:03
Comment thread rootfs.py
Comment on lines +161 to +163
if args.docker:
args.external_sources = True

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Why do we need this?

Comment thread rootfs.py
generator.prepare(target, using_kernel=False)
arch = stage0_arch_map.get(args.arch, args.arch)
init = os.path.join(os.sep, 'bootstrap-seeds', 'POSIX', arch, 'kaem-optional-seed')
print(generator.target_dir, init)

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

leftover debug print

Comment thread steps/improve/finalize_fhs.sh Outdated
# Add /etc/resolv.conf
echo 'nameserver 1.1.1.1' > /etc/resolv.conf
echo 'nameserver 1.1.1.1' > /etc/resolv.conf.head
if [ "${EXTERNAL_SOURCES}" = "False" ]; then

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Again, is this the only way to do this? Wouldn't it work to have a ${DOCKER} to disable writing resolv.conf, and still retain the ability to run without predownloading everything on the host?

Comment thread Dockerfile

FROM scratch as build
ADD target/ /
RUN ["/bootstrap-seeds/POSIX/x86/kaem-optional-seed"]

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Pass "arch" from bootstrap() here, if possible, rather than hardcoding "x86".

Comment thread Dockerfile

FROM build as install
ENV PATH=/bin:/usr/sbin:/usr/bin
RUN set -eux; \

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

is the inclusion of the "x" flag intentional here, or just leftover from debugging?

Comment thread Dockerfile
# SPDX-License-Identifier: GPL-3.0-or-later

FROM scratch as build
ADD target/ /

@Googulator Googulator Jan 30, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Pass target directory from bootstrap() here, if possible, rather than hardcoding "target".

@@ -16,8 +16,58 @@ mount | grep '/sys' &> /dev/null || (mkdir -p /sys; mount -t sysfs sysfs /sys)
mount | grep '/tmp' &> /dev/null || (mkdir -p /tmp; mount -t tmpfs tmpfs /tmp)

@Googulator Googulator Feb 15, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

typo: resolv.conf.head

if [ "${EXTERNAL_SOURCES}" = "False" ]; then
# Add /etc/resolv.conf
if [ "${CHROOT}" = False ]; then
rm /etc/mtab

@Googulator Googulator Feb 15, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Won't this conflict with later steps?

Nauscar added a commit to Nauscar/live-bootstrap that referenced this pull request Dec 5, 2025
Nauscar added a commit to Nauscar/live-bootstrap that referenced this pull request Dec 5, 2025

Nauscar commented Dec 5, 2025

Copy link
Copy Markdown

@lrvick thanks for the docker support. I rebased your branch with the latest in master and have included a commit incorporating feedback in this PR.

I did not want to open a redundant PR, but my changes can be found here.

Thank you @stikonas, @Googulator and other contributors for all your efforts.

Copy link
Copy Markdown
Owner

Hi @Nauscar, feel free to open a new PR that supersedes this one :)

@Nauscar Nauscar mentioned this pull request Dec 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Googulator Googulator Googulator approved these changes
@stikonas stikonas Awaiting requested review from stikonas

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /