Skip to content

Commit

Permalink
use podman --remote instead of db-host-exec
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Detjens <[email protected]>
  • Loading branch information
detjensrobert committed Oct 19, 2024
1 parent effb994 commit 1a44920
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
8 changes: 7 additions & 1 deletion arch/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ RUN useradd yaybuilder --groups wheel --create-home && \
RUN sed -i -E 's|exec .+podman|exec podman|' $(find /usr -name docker)

# pre set distrobox host links
RUN for f in systemctl journalctl xdg-open firefox podman flatpak op ; do \
RUN for f in systemctl journalctl xdg-open firefox flatpak op ; do \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/$f; \
done

# make podman command remote
COPY <<EOF /usr/local/bin/podman
#!/bin/sh
exec podman --remote "$@"
EOF

LABEL io.containers.autoupdate=registry \
name="Custom Archlinux Toolbox" \
maintainer=detjensrobert \
Expand Down
21 changes: 15 additions & 6 deletions ubuntu/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@ RUN apt-get install -y $(cat /packages | grep -v '#' | xargs) && rm /packages
# fix bat program name
RUN ln -s /usr/bin/batcat /usr/bin/bat

# make podman command remote
COPY <<EOF /usr/local/bin/podman
#!/bin/sh
exec podman --remote "$@"
EOF

# pre set distrobox host links
RUN ln -s /usr/bin/distrobox-host-exec /usr/local/bin/firefox && \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/systemctl && \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/xdg-open && \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/journalctl && \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/flatpak
RUN for f in systemctl journalctl xdg-open firefox flatpak op ; do \
ln -s /usr/bin/distrobox-host-exec /usr/local/bin/$f; \
done

LABEL io.containers.autoupdate=registry \
name="Custom Ubuntu Toolbox" \
maintainer=detjensrobert \
org.opencontainers.image.source="https://github.com/detjensrobert/toolbx-images"

0 comments on commit 1a44920

Please sign in to comment.