From b53c8ceef1b804a584887e5071ebecbc4b73d359 Mon Sep 17 00:00:00 2001
From: James Robinson <james.em.robinson@gmail.com>
Date: Thu, 24 Aug 2023 19:20:05 +0100
Subject: [PATCH] :recycle: Use AdGuard arguments from entrypoint.sh

---
 .../pulumi/components/sre_dns_server.py       | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/data_safe_haven/pulumi/components/sre_dns_server.py b/data_safe_haven/pulumi/components/sre_dns_server.py
index 5e330d8309..5306fb7f17 100644
--- 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(