Use sudo for installing docker (#308)

vgijssel · Jun 1, 2023 · 10eae82 · 10eae82
1 parent 411de0a
commit 10eae82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/provisioner/deploys/docker/tasks/install_docker.py b/provisioner/deploys/docker/tasks/install_docker.py
@@ -19,6 +19,7 @@ def install_docker():
         packages=["curl", "ca-certificates", "gnupg"],
         update=True,
         cache_time=24 * 60 * 60,
+        _sudo=True,
     )
 
     server.shell(
@@ -42,6 +43,7 @@ def install_docker():
             "deb [arch={arch} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/{distro} {version_codename} stable"
         ).format(arch=arch, distro=distro, version_codename=version_codename),
         filename="docker-ce-stable",
+        _sudo=True,
     )
 
     apt.packages(
@@ -55,6 +57,7 @@ def install_docker():
         ],
         update=True,
         cache_time=0 if add_apt_repo.changed else 24 * 60 * 60,
+        _sudo=True,
     )
 
     existing_groups = host.get_fact(Users)["ubuntu"]["groups"]

diff --git a/provisioner/deploys/monitoring/tasks/install_monitoring.py b/provisioner/deploys/monitoring/tasks/install_monitoring.py
@@ -82,7 +82,7 @@ def install_monitoring():
         _sudo=True,
     )
 
-    apt.repo(
+    add_apt_repo = apt.repo(
         name="Install New Relic repo",
         src=f"deb https://download.newrelic.com/infrastructure_agent/linux/apt/ {version_codename} main",
         filename="newrelic-infra",
@@ -94,7 +94,7 @@ def install_monitoring():
         packages=["newrelic-infra"],
         update=True,
         present=True,
-        cache_time=24 * 60 * 60,
+        cache_time=0 if add_apt_repo.changed else 24 * 60 * 60,
         _sudo=True,
     )