Merge branch '89luca89:main' into main

89luca89 · Dec 14, 2024 · e1496bb · e1496bb
2 parents 2dbe89f + 3bac964
commit e1496bb
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 35 deletions.
diff --git a/.github/workflows/manpages.yml b/.github/workflows/manpages.yml
@@ -24,6 +24,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           # Checkout as many commits as needed for the diff
+          repository: 89luca89/distrobox
+          ref: main
+          persist-credentials: false
           fetch-depth: 2
           token: ${{ secrets.PAT }}
 

diff --git a/distrobox-create b/distrobox-create
@@ -599,7 +599,7 @@ get_clone_image()
 	# to perform this we first ensure the source container exists and that the
 	# source container is stopped, else the clone will not work,
 	container_source_status="$(${container_manager} inspect --type container \
-		"${container_clone}" --format '{{.State.Status}}')"
+		--format '{{.State.Status}}' "${container_clone}")"
 	# If the container is not already running, we need to start if first
 	if [ "${container_source_status}" = "running" ]; then
 		printf >&2 "Container %s is running.\nPlease stop it first.\n" "${container_clone}"
@@ -610,7 +610,7 @@ get_clone_image()
 	# Now we can extract the container ID and commit it to use as source image
 	# for the new container.
 	container_source_id="$(${container_manager} inspect --type container \
-		"${container_clone}" --format '{{.ID}}')"
+		--format '{{.ID}}' "${container_clone}")"
 	container_commit_tag="$(echo "${container_clone}:$(date +%F)" | tr '[:upper:]' '[:lower:]')"
 
 	# Commit current container state to a new image tag
@@ -995,6 +995,10 @@ fi
 # if we are using the clone flag, let's set the image variable
 # to the output of container duplication
 if [ -n "${container_clone}" ]; then
+	if ! echo "${container_manager}" | grep -Eq "podman|docker"; then
+		printf >&2 "ERROR: clone is only supported with docker and podman\n"
+		exit 127
+	fi
 	container_image="$(get_clone_image)"
 fi
 

diff --git a/distrobox-init b/distrobox-init
@@ -513,6 +513,8 @@ setup_deb_exceptions()
 #   None
 setup_pacman_exceptions()
 {
+	setup_pkg_manager_hooks
+
 	# Workarounds for pacman. We need to exclude the paths by using a pre-hook to umount them and a
 	# post-hook to remount them. Additionally we neutralize the systemd-post-hooks as they do not
 	# work on a rootless container system.
@@ -1238,7 +1240,7 @@ setup_pacman()
 	pacman -S --needed --noconfirm $(pacman -Ssq | grep -E "^($(echo ${deps} | tr ' ' '|'))$")
 
 	if [ ! -e "/usr/share/i18n/locales${HOST_LOCALE}" ]; then
-		pacman -S --noconfirm glibc
+		pacman -S --noconfirm glibc glibc-locales
 	fi
 
 	# Setup hooks

diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -68,7 +68,7 @@ Distrobox has been successfully tested on:
 | SUSE Linux Enterprise Server | 15 SP5 <br> or later | `distrobox` is available in `SUSE Package Hub` repo. <br> Enable this repo and then: <br> `zypper install distrobox`. <br>Prior to SLES 15 SP6 ``podman`` logging needs to be configured properly, more details in [this openSUSE bug](https://bugzilla.opensuse.org/show_bug.cgi?id=1199871). |
 | SteamOS | | You can follow the [Install Podman in a static manner](posts/install_podman_static.md) or [Install Lilipod in a static manner](posts/install_lilipod_static.md) guide, this will install it in your $HOME and it will survive updates. |
 | RedHat | 8 <br> 9  | `distrobox` is available in epel repos. (thanks [alcir](https://github.com/alcir)!) |
-| Ubuntu | 18.04 <br> 20.04 <br> 22.04 <br> 22.10 <br> 23.04 <br>| Older versions based on 20.04 or earlier may need external repos to install newer Podman and Docker releases. <br> Derivatives like Pop_OS!, Mint and Elementary OS should work the same. <br> [Now PPA available!](https://launchpad.net/~michel-slm/+archive/ubuntu/distrobox), also `distrobox` is available in default repos from `22.10` onward (thanks [michel-slm](https://github.com/michel-slm)!)  |
+| Ubuntu | 18.04 <br> 20.04 <br> 22.04 <br> 23.04 <br> 24.04 <br>| Older versions based on 20.04 or earlier may need external repos to install newer Podman and Docker releases. <br> Derivatives like Pop_OS!, Mint and Elementary OS should work the same. <br> [Now PPA available!](https://launchpad.net/~michel-slm/+archive/ubuntu/distrobox), also `distrobox` is available in default repos from `22.10` onward (thanks [michel-slm](https://github.com/michel-slm)!)  |
 | Vanilla OS | 22.10 <br> Orchid | `distrobox` should be installed in the home directory using the official script |
 | Void Linux | glibc <br> musl | |
 | Windows | Oracle Linux 9 | using built-in Windows Subsystem for Linux |
@@ -155,7 +155,7 @@ Distrobox guests tested successfully with the following container images:
 | Rocky Linux | 8 <br> 8-minimal <br> 9 | quay.io/rockylinux/rockylinux:8 <br> quay.io/rockylinux/rockylinux:8-minimal <br> quay.io/rockylinux/rockylinux:9 <br> quay.io/rockylinux/rockylinux:latest    |
 | Slackware | | docker.io/vbatts/slackware:current |
 | SteamOS | | ghcr.io/linuxserver/steamos:latest |
-| Ubuntu | 14.04 <br> 16.04 <br> 18.04 <br> 20.04 <br> 22.04 <br> 23.04 | docker.io/library/ubuntu:14.04 <br> docker.io/library/ubuntu:16.04 <br> docker.io/library/ubuntu:18.04 <br> docker.io/library/ubuntu:20.04 <br> docker.io/library/ubuntu:22.04 <br> docker.io/library/ubuntu:23.04 |
+| Ubuntu | 14.04 <br> 16.04 <br> 18.04 <br> 20.04 <br> 22.04 <br> 24.04 | docker.io/library/ubuntu:14.04 <br> docker.io/library/ubuntu:16.04 <br> docker.io/library/ubuntu:18.04 <br> docker.io/library/ubuntu:20.04 <br> docker.io/library/ubuntu:22.04 <br> docker.io/library/ubuntu:24.04 |
 | Vanilla OS | VSO | ghcr.io/vanilla-os/vso:main |
 | Void Linux | glibc <br> musl | ghcr.io/void-linux/void-glibc-full:latest <br> ghcr.io/void-linux/void-musl-full:latest |
 

diff --git a/man/man1/distrobox-assemble.1 b/man/man1/distrobox-assemble.1
@@ -15,7 +15,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-ASSEMBLE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-ASSEMBLE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-compatibility.1 b/man/man1/distrobox-compatibility.1
@@ -15,7 +15,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH COMPATIBILITY
 .PP
@@ -404,11 +404,11 @@ T}
 T{
 Ubuntu
 T}@T{
-14.04 16.04 18.04 20.04 22.04 23.04
+14.04 16.04 18.04 20.04 22.04 24.04
 T}@T{
 docker.io/library/ubuntu:14.04 docker.io/library/ubuntu:16.04
 docker.io/library/ubuntu:18.04 docker.io/library/ubuntu:20.04
-docker.io/library/ubuntu:22.04 docker.io/library/ubuntu:23.04
+docker.io/library/ubuntu:22.04 docker.io/library/ubuntu:24.04
 T}
 T{
 Vanilla OS

diff --git a/man/man1/distrobox-create.1 b/man/man1/distrobox-create.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-CREATE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-CREATE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-enter.1 b/man/man1/distrobox-enter.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-ENTER" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-ENTER" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-ephemeral.1 b/man/man1/distrobox-ephemeral.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-EPHEMERAL" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-EPHEMERAL" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-export.1 b/man/man1/distrobox-export.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-EXPORT" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-EXPORT" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-generate-entry.1 b/man/man1/distrobox-generate-entry.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-GENERATE-ENTRY" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-GENERATE-ENTRY" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-host-exec.1 b/man/man1/distrobox-host-exec.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-HOST-EXEC" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-HOST-EXEC" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-init.1 b/man/man1/distrobox-init.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-INIT" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-INIT" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-list.1 b/man/man1/distrobox-list.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-LIST" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-LIST" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-rm.1 b/man/man1/distrobox-rm.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-RM" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-RM" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-stop.1 b/man/man1/distrobox-stop.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-STOP" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-STOP" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox-upgrade.1 b/man/man1/distrobox-upgrade.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-UPGRADE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-UPGRADE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP

diff --git a/man/man1/distrobox.1 b/man/man1/distrobox.1
@@ -15,7 +15,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-ASSEMBLE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-ASSEMBLE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -394,7 +394,7 @@ exported_bins_path=\[dq]\[ti]/.local/bin\[dq]
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH COMPATIBILITY
 .PP
@@ -783,11 +783,11 @@ T}
 T{
 Ubuntu
 T}@T{
-14.04 16.04 18.04 20.04 22.04 23.04
+14.04 16.04 18.04 20.04 22.04 24.04
 T}@T{
 docker.io/library/ubuntu:14.04 docker.io/library/ubuntu:16.04
 docker.io/library/ubuntu:18.04 docker.io/library/ubuntu:20.04
-docker.io/library/ubuntu:22.04 docker.io/library/ubuntu:23.04
+docker.io/library/ubuntu:22.04 docker.io/library/ubuntu:24.04
 T}
 T{
 Vanilla OS
@@ -871,7 +871,7 @@ up the integration independently from the distrobox\[cq]s own flag.
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-CREATE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-CREATE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1266,7 +1266,7 @@ Void Linux (glibc)
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-ENTER" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-ENTER" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1416,7 +1416,7 @@ run distrobox commands involving rootful containers using `doas'.
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-EPHEMERAL" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-EPHEMERAL" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1488,7 +1488,7 @@ a list of supported environment variables to use.
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-EXPORT" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-EXPORT" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1645,7 +1645,7 @@ option to provide a series of flags, for example:
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-GENERATE-ENTRY" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-GENERATE-ENTRY" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1723,7 +1723,7 @@ distrobox generate-entry container-name --delete
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-HOST-EXEC" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-HOST-EXEC" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1797,7 +1797,7 @@ distrobox-host-exec podman ps -a
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-INIT" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-INIT" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1865,7 +1865,7 @@ distrobox-init --upgrade
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-LIST" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-LIST" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -1936,7 +1936,7 @@ DBX_SUDO_PROGRAM
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-RM" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-RM" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -2008,7 +2008,7 @@ DBX_SUDO_PROGRAM
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-STOP" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-STOP" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP
@@ -2085,7 +2085,7 @@ DBX_SUDO_PROGRAM
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "DISTROBOX-UPGRADE" "1" "Oct 2024" "Distrobox" "User Manual"
+.TH "DISTROBOX-UPGRADE" "1" "Dec 2024" "Distrobox" "User Manual"
 .hy
 .SH NAME
 .IP