Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Build-Bootstraper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ jobs:
else
printf "%s\n" "gunzip command is not present in the image."
fi
for REQ_CMD in "bash" "basename" "cat" "chgrp" "chmod" "chown" "cp" "date" "dirname" "find" "grep" "head" "mkdir" "mv" "rm" "sed" ; do
for REQ_CMD in "bash" "basename" "cat" "chgrp" "chmod" "chown" "cp" "date" "dirname" "find" "grep" "head" "mkdir" "mv" "rm" "sed" "sha256sum" "sha512sum" ; do
if docker exec test-container /bin/bash -c "which ${REQ_CMD}"; then
printf "%s\n" "${REQ_CMD:-unknown} command is present in the image." ;
printf "%s\n" "${REQ_CMD:-unknown} command is configured in the path." ;
Expand All @@ -346,7 +346,7 @@ jobs:
fi ;
done ;
printf "::endgroup::\n\n"
for REQ_PATH in "/bin" "/usr/bin" "/sbin" "/usr/bin" "/usr/local/bin" "/usr/local/sbin" "/usr/libexec" "/etc" "/var" "/" ; do
for REQ_PATH in "/bin" "/usr/" "/sbin" "/usr/bin" "/usr/local/bin" "/usr/local/sbin" "/usr/lib" "/usr/libexec" "/etc" "/var" "/" ; do
printf "::group::%s\n" "${REQ_PATH}"
if docker exec test-container /bin/bash -c "test -d ${REQ_PATH}"; then
printf "%s\n" "${REQ_PATH:-unknown} path is present in the image." ;
Expand Down
10 changes: 9 additions & 1 deletion dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ RUN set -eux \
ln -fns "$f" "${DESTDIR}"/lib/ld-musl.so.1 || true; \
done || true

# Stage 3: Create the final image
# Stage 3: Copy over featherHash (0BSD Licensed)
FROM --platform="linux/${TARGETARCH}" ghcr.io/reactive-firewall/featherhash-shasum:master AS mitl-featherhash

# Stage 4: Create the final image
# shellcheck disable=SC2154
FROM --platform="linux/${TARGETARCH}" scratch AS mitl-bootstrap

Expand All @@ -243,6 +246,11 @@ COPY --from=builder /output/fs /
# Ensure toybox is reachable at /bin/toybox (symlink if needed)
COPY --from=builder /output/fs/usr/bin/toybox /bin/toybox

# Ensure sha256sum is reachable at /bin/sha256sum
COPY --from=mitl-featherhash /bin/sha256sum /bin/sha256sum
COPY --from=mitl-featherhash /bin/sha384sum /bin/sha384sum
COPY --from=mitl-featherhash /bin/sha512sum /bin/sha512sum

SHELL [ "/bin/bash", "--norc", "-c" ]

# Set the entry point to Toybox
Expand Down