Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix(rootfs): ship busybox-extras so podroid-docs can serve the guide

ExTvd0f847f06075
diff --git a/build-rootfs/build-rootfs.sh b/build-rootfs/build-rootfs.sh
index f356f9b..8323b46 100755
--- a/build-rootfs/build-rootfs.sh
+++ b/build-rootfs/build-rootfs.sh
@@ -19,6 +19,7 @@ apk -X "https://dl-cdn.alpinelinux.org/alpine/v${ALPINE_BRANCH}/main" \
alpine-base \
openrc \
busybox-openrc \
+ busybox-extras \
bash \
podman \
docker docker-openrc docker-cli-compose \
diff --git a/build-rootfs/files/usr/local/bin/podroid-docs b/build-rootfs/files/usr/local/bin/podroid-docs
index 0d5b760..711109d 100644
--- a/build-rootfs/files/usr/local/bin/podroid-docs
+++ b/build-rootfs/files/usr/local/bin/podroid-docs
@@ -18,4 +18,5 @@ fi
echo "Serving the Podroid docs at http://127.0.0.1:9980 (Ctrl-C to stop)"
echo "From the phone: podroid-forward add 9980 9980 tcp, then open http://127.0.0.1:9980"
-exec busybox httpd -f -p 9980 -h "$DOCROOT"
+# Alpine ships httpd in busybox-extras, not in the base busybox applet set.
+exec busybox-extras httpd -f -p 9980 -h "$DOCROOT"
diff --git a/docs/guide/getting-started.html b/docs/guide/getting-started.html
index a69f70a..1e393ec 100644
--- a/docs/guide/getting-started.html
+++ b/docs/guide/getting-started.html
@@ -125,7 +125,7 @@
<p>This guide also ships inside the guest, for reading with no network connection. From the terminal:</p>
<pre><code><span class="p">$</span> podroid-forward add 9980 9980 tcp
<span class="p">$</span> podroid-docs</code></pre>
- <p>Open <code>http://127.0.0.1:9980</code> in the phone's browser. <code>podroid-docs</code> serves <code>/usr/share/doc/podroid</code> with busybox's <code>httpd</code> and runs in the foreground until you stop it with Ctrl-C.</p>
+ <p>Open <code>http://127.0.0.1:9980</code> in the phone's browser. <code>podroid-docs</code> serves <code>/usr/share/doc/podroid</code> with busybox's <code>httpd</code> (from <code>busybox-extras</code>) and runs in the foreground until you stop it with Ctrl-C.</p>
<div class="callout warn">
<span class="label">VM killed when you switch apps?</span>