Skip to content

Commit aa88736

Browse files
authored
Merge pull request #130 from rothgar/debian
fix: Actually build debian toolbox from debian
2 parents 7fc7966 + 28c6827 commit aa88736

File tree

1 file changed

+24
-27
lines changed

1 file changed

+24
-27
lines changed
+24-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
1-
FROM docker.io/library/ubuntu:24.04
2-
# FROM https://hub.docker.com/_/ubuntu
1+
FROM docker.io/library/debian:bookworm
2+
# FROM https://hub.docker.com/_/debian
33

44
LABEL com.github.containers.toolbox="true" \
5-
name="ubuntu-toolbox" \
6-
usage="This image is meant to be used with the toolbox or distrobox command" \
7-
summary="A cloud-native terminal experience powered by Ubuntu" \
8-
maintainer="jorge.castro@gmail.com"
5+
name="debian-toolbox" \
6+
usage="This image is meant to be used with the toolbox or distrobox command" \
7+
summary="A cloud-native terminal experience powered by Debian" \
8+
maintainer="justin@linux.com"
99

10-
COPY ./toolboxes/ubuntu-toolbox/packages.ubuntu /toolbox-packages
10+
COPY ./toolboxes/debian-toolbox/packages.debian /toolbox-packages
1111

1212
RUN rm /etc/apt/apt.conf.d/docker-gzip-indexes /etc/apt/apt.conf.d/docker-no-languages && \
13-
sed -Ei 's/^(hosts:.*)(\<files\>)\s*(.*)/\1\2 myhostname \3/' /etc/nsswitch.conf && \
14-
apt-get update && \
15-
DEBIAN_FRONTEND=noninteractive apt-get -y install \
16-
ubuntu-minimal ubuntu-standard \
17-
libnss-myhostname \
18-
flatpak-xdg-utils \
19-
$(cat toolbox-packages | xargs) && \
20-
rm -rd /var/lib/apt/lists/* && \
21-
rm /toolbox-packages && \
22-
mkdir /usr/share/empty && \
23-
userdel --remove ubuntu && \
24-
curl -sLo /usr/bin/host-spawn https://github.com/1player/host-spawn/releases/download/1.5.0/host-spawn-x86_64 && \
25-
chmod +x /usr/bin/host-spawn && \
26-
rm /etc/apt/apt.conf.d/20apt-esm-hook.conf && \
27-
ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ && \
28-
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
29-
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
30-
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
31-
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
32-
echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
13+
sed -Ei 's/^(hosts:.*)(\<files\>)\s*(.*)/\1\2 myhostname \3/' /etc/nsswitch.conf && \
14+
apt-get update && \
15+
DEBIAN_FRONTEND=noninteractive apt-get -y install \
16+
libnss-myhostname \
17+
flatpak-xdg-utils \
18+
$(cat toolbox-packages | xargs) && \
19+
rm -rd /var/lib/apt/lists/* && \
20+
rm /toolbox-packages && \
21+
mkdir /usr/share/empty && \
22+
curl -sLo /usr/bin/host-spawn https://github.com/1player/host-spawn/releases/download/1.5.0/host-spawn-x86_64 && \
23+
chmod +x /usr/bin/host-spawn && \
24+
ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ && \
25+
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
26+
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
27+
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
28+
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
29+
echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers

0 commit comments

Comments
 (0)