feat(sidecar): merge with master

uc-cdis · Feb 17, 2020 · 7474892 · 7474892
1 parent d479d65
commit 7474892
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/sidecarDockerfile b/sidecarDockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.12-alpine
 
-RUN apk update && apk add --no-cache git ca-certificates gcc musl-dev git fuse jq curl bash
+RUN apk update && apk add --no-cache git ca-certificates gcc musl-dev git fuse jq curl bash python3
 
 RUN mkdir -p $GOPATH/src/github.com/uc-cdis/gen3-fuse
 WORKDIR $GOPATH/src/github.com/uc-cdis/gen3-fuse

diff --git a/sidecarDockerrun.sh b/sidecarDockerrun.sh
@@ -39,8 +39,12 @@ while true; do
         fi
     else
         OLDDIR=`df /data/manifest* |  grep manifest | cut -d'/' -f 3 | head -n 1`
-        echo unmount old manifest $OLDDIR
-        fusermount -u /data/$OLDDIR; rm -rf /data/$OLDDIR
+        if [ ! -z "$OLDDIR" ]; then
+            echo unmount old manifest $OLDDIR
+            fusermount -u /data/$OLDDIR; rm -rf /data/$OLDDIR
+        else
+            echo "[WARNING] Empty $OLDDIR"
+        fi
     fi
     sleep 10
 done