♻️ Use AdGuard arguments from entrypoint.sh

alan-turing-institute · Aug 24, 2023 · b53c8ce · b53c8ce
1 parent 9939f5f
commit b53c8ce
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/data_safe_haven/pulumi/components/sre_dns_server.py b/data_safe_haven/pulumi/components/sre_dns_server.py
@@ -222,18 +222,13 @@ def __init__(
                 containerinstance.ContainerArgs(
                     image="adguard/adguardhome:v0.107.36",
                     name="adguard",
-                    # Note that providing "command" overwrites the CMD arguments in the
-                    # Docker image, so we can either provide them here or set defaults
-                    # in our custom entrypoint.
-                    command=[
-                        "/bin/sh",
-                        "/opt/adguardhome/custom/entrypoint.sh",
-                        "--no-check-update",
-                        "-c",
-                        "/opt/adguardhome/conf/AdGuardHome.yaml",
-                        "-w",
-                        "/opt/adguardhome/work",
-                    ],
+                    # Providing "command" overwrites the CMD arguments in the Docker
+                    # image, so we can either provide them here or set defaults in our
+                    # custom entrypoint.
+                    #
+                    # The entrypoint script will not be executable when mounted so we
+                    # need to explicitly run it with /bin/sh
+                    command=["/bin/sh", "/opt/adguardhome/custom/entrypoint.sh"],
                     environment_variables=[],
                     ports=[
                         containerinstance.ContainerPortArgs(