From b162752ce60cfbc7a7391d252f4241aead4c4f11 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Thu, 9 Dec 2021 12:16:24 -0500
Subject: [PATCH] .drone.jsonnet: Do not use guix shell containerization as it
 fails within non-privileged docker

---
 .drone.jsonnet | 2 +-
 .drone.yml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 5448d50..d1abcf3 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -110,7 +110,7 @@ local promoteStep(env,
 
 local deployStep(name, target=name, args=[]) = guix_step_time_machine(
   name,
-  std.format('shell -CN -E "^AWS.*$" -m manifest.scm -- make %s ENV="${DRONE_DEPLOY_TO}" %s', [target, std.join(" ", args)]),
+  std.format('shell -m manifest.scm -- make %s ENV="${DRONE_DEPLOY_TO}" %s', [target, std.join(" ", args)]),
   cwd="infra",
   channels="../channels.scm")
     .withEnv({ PLAN: "out.plan" } + env_from_secret({
diff --git a/.drone.yml b/.drone.yml
index 0f413a9..473e199 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -72,7 +72,7 @@ steps:
   commands:
   - cd infra
   - echo 'root:x:0:0:root:/root:/bin/bash' >> /etc/passwd
-  - "guix time-machine -C ../channels.scm -- shell -CN -E \"^AWS.*$\" -m manifest.scm -- make setup ENV=\"${DRONE_DEPLOY_TO}\" "
+  - "guix time-machine -C ../channels.scm -- shell -m manifest.scm -- make setup ENV=\"${DRONE_DEPLOY_TO}\" "
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: aws_access_key_id
@@ -86,7 +86,7 @@ steps:
   commands:
   - cd infra
   - echo 'root:x:0:0:root:/root:/bin/bash' >> /etc/passwd
-  - "guix time-machine -C ../channels.scm -- shell -CN -E \"^AWS.*$\" -m manifest.scm -- make plan ENV=\"${DRONE_DEPLOY_TO}\" "
+  - "guix time-machine -C ../channels.scm -- shell -m manifest.scm -- make plan ENV=\"${DRONE_DEPLOY_TO}\" "
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: aws_access_key_id
@@ -100,7 +100,7 @@ steps:
   commands:
   - cd infra
   - echo 'root:x:0:0:root:/root:/bin/bash' >> /etc/passwd
-  - "guix time-machine -C ../channels.scm -- shell -CN -E \"^AWS.*$\" -m manifest.scm -- make deploy ENV=\"${DRONE_DEPLOY_TO}\" "
+  - "guix time-machine -C ../channels.scm -- shell -m manifest.scm -- make deploy ENV=\"${DRONE_DEPLOY_TO}\" "
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: aws_access_key_id