From ff4d2f9fd0143013b57e392972897e122201e6f9 Mon Sep 17 00:00:00 2001
From: Kevin O'Gorman <kog@freedom.press>
Date: Wed, 5 Aug 2020 17:39:07 -0400
Subject: [PATCH] Updated admin docker wrapper to skip working directory setup
 in CI

---
 admin/bin/dev-shell | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/bin/dev-shell b/admin/bin/dev-shell
index b22b9886d1..44bdfdb7de 100755
--- a/admin/bin/dev-shell
+++ b/admin/bin/dev-shell
@@ -26,12 +26,18 @@ function docker_image() {
 }
 
 function docker_run() {
-    docker run \
-        --rm \
-           --user "${USER:-root}" \
-           --volume "${TOPLEVEL}:/sd-root" \
-           --workdir "/sd-root/admin" \
-           -ti ${DOCKER_RUN_ARGUMENTS:-} securedrop-admin "$@"
+    if [ -z "${CIRCLECI-}" ]
+    then
+        docker run \
+            --rm \
+            --user "${USER:-root}" \
+            --volume "${TOPLEVEL}:/sd-root" \
+            --workdir "/sd-root/admin" \
+            -ti ${DOCKER_RUN_ARGUMENTS:-} securedrop-admin "$@"
+    else
+        docker run --rm -ti ${DOCKER_RUN_ARGUMENTS:-} securedrop-admin "$@"
+    fi
+
 }
 
 docker_image