Updated admin docker wrapper to skip working directory setup in CI

freedomofpress · Aug 5, 2020 · 35c513f · 35c513f
1 parent 125c2bc
commit 35c513f
Showing 1 changed file with 12 additions and 6 deletions.
diff --git 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