Run: Only mount gpg if gpg is installed and files exist

checks.mk

@@ -10,7 +10,7 @@ else
 	SUFFIX := "
 endif
 
-all: black mypy pytest package lintian clean
+all: black isort mypy pytest package lintian clean
 	@echo SUCCESS
 
 black:

debpic/python/debpic_test.py

@@ -65,21 +65,21 @@ def test_run_container(self):
         assert self.cli_commands.pop(0) == "gpgconf --list-dir homedir"
         assert (
             self.cli_commands.pop(0)
-            == """docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=/run/user/1000/gnupg/S.gpg-agent,dst=/home/docker/.gnupg/S.gpg-agent,readonly --mount type=bind,src=/home/debpic_user/.gnupg/pubring.kbx,dst=/home/docker/.gnupg/pubring.kbx,readonly --mount type=bind,src=/home/debpic_user/.gnupg/trustdb.gpg,dst=/home/docker/.gnupg/trustdb.gpg,readonly --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS=""  test_name /bin/bash -c 'if [[ -x /usr/bin/hook ]]; then /usr/bin/hook; fi && dpkg-buildpackage  && mv-debs && dpkg-buildpackage --target=clean'"""
+            == """docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly  --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS=""  test_name /bin/bash -c 'if [[ -x /usr/bin/hook ]]; then /usr/bin/hook; fi && dpkg-buildpackage  && mv-debs && dpkg-buildpackage --target=clean'"""
         )
 
         run.run_container("test_name", "echo I'm a test command")
         assert self.cli_commands.pop(0) == "gpgconf --list-dirs agent-socket"
         assert self.cli_commands.pop(0) == "gpgconf --list-dir homedir"
         assert (
             self.cli_commands.pop(0)
-            == "docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=/run/user/1000/gnupg/S.gpg-agent,dst=/home/docker/.gnupg/S.gpg-agent,readonly --mount type=bind,src=/home/debpic_user/.gnupg/pubring.kbx,dst=/home/docker/.gnupg/pubring.kbx,readonly --mount type=bind,src=/home/debpic_user/.gnupg/trustdb.gpg,dst=/home/docker/.gnupg/trustdb.gpg,readonly --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS=\"\"  test_name /bin/bash -c 'if [[ -x /usr/bin/hook ]]; then /usr/bin/hook; fi && echo I'm a test command'"
+            == """docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly  --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS=\"\"  test_name /bin/bash -c 'if [[ -x /usr/bin/hook ]]; then /usr/bin/hook; fi && echo I'm a test command'"""
         )
 
         run.run_container("test_name", "", "", "--interactive")
         assert self.cli_commands.pop(0) == "gpgconf --list-dirs agent-socket"
         assert self.cli_commands.pop(0) == "gpgconf --list-dir homedir"
         assert (
             self.cli_commands.pop(0)
-            == 'docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=/run/user/1000/gnupg/S.gpg-agent,dst=/home/docker/.gnupg/S.gpg-agent,readonly --mount type=bind,src=/home/debpic_user/.gnupg/pubring.kbx,dst=/home/docker/.gnupg/pubring.kbx,readonly --mount type=bind,src=/home/debpic_user/.gnupg/trustdb.gpg,dst=/home/docker/.gnupg/trustdb.gpg,readonly --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS="" --interactive test_name '
+            == """docker run --mount type=bind,src=${PWD},dst=/workspaces/code --mount type=volume,src=debpic_cache,dst=/home/docker/.cache --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly  --user 1000:$(id -g 1000) --network host --tty --rm --env DEB_BUILD_OPTIONS="" --interactive test_name """
         )

debpic/python/run.py

@@ -1,6 +1,8 @@
 import os
+import os.path
 import subprocess
 import sys
+from shutil import which
 
 import common
 
@@ -35,18 +37,24 @@ def run_container(
 
     deb_build_options = os.environ.get("DEB_BUILD_OPTIONS", "")
 
-    # TODO: If the host doesn't have gpg installed then skip this.
-    gpg_socket = common.run("gpgconf --list-dirs agent-socket").strip()
-    gpg_home = common.run("gpgconf --list-dir homedir").strip()
+    gpg_mount_cmds = ""
+    if which("gpg") is not None:
+        gpg_socket = common.run("gpgconf --list-dirs agent-socket").strip()
+        gpg_home = common.run("gpgconf --list-dir homedir").strip()
+
+        if os.path.exists(f"{gpg_home}/pubring.kbx"):
+            if os.path.exists(f"{gpg_home}/trustdb.gpg"):
+                gpg_mount_cmds = f"""\
+--mount type=bind,src={gpg_socket},dst=/home/docker/.gnupg/S.gpg-agent,readonly
+--mount type=bind,src={gpg_home}/pubring.kbx,dst=/home/docker/.gnupg/pubring.kbx,readonly
+--mount type=bind,src={gpg_home}/trustdb.gpg,dst=/home/docker/.gnupg/trustdb.gpg,readonly"""
 
     run_cmd = f"""\
 docker run
 --mount type=bind,src=${{PWD}},dst=/workspaces/code
 --mount type=volume,src=debpic_cache,dst=/home/docker/.cache
---mount type=bind,src={gpg_socket},dst=/home/docker/.gnupg/S.gpg-agent,readonly
---mount type=bind,src={gpg_home}/pubring.kbx,dst=/home/docker/.gnupg/pubring.kbx,readonly
---mount type=bind,src={gpg_home}/trustdb.gpg,dst=/home/docker/.gnupg/trustdb.gpg,readonly
 --mount type=bind,src=$HOME/.config,dst=/home/docker/.config,readonly
+{gpg_mount_cmds}
 --user {common.get_uid()}:$(id -g {common.get_uid()})
 --network host
 --tty