Merge branch 'release/4.5.2-0alvistack1'

alvistack · Feb 28, 2018 · 05b115a · 05b115a
2 parents c39c852 + 798a1d5
commit 05b115a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -63,6 +63,7 @@ RUN set -ex \
 RUN set -ex \
     && ARCHIVE="`mktemp --suffix=.zip`" \
     && curl -skL $FISHEYE_DOWNLOAD_URL > $ARCHIVE \
+    && mkdir -p $FISHEYE_CATALINA \
     && TMP_DIR="`mktemp -d`" && unzip -qq $ARCHIVE -x -d $TMP_DIR && rsync -av $TMP_DIR/*/ $FISHEYE_CATALINA && rm -rf $TMP_DIR \
     && chown -Rf $FISHEYE_OWNER:$FISHEYE_GROUP $FISHEYE_CATALINA \
     && rm -rf $ARCHIVE

diff --git a/files/opt/atlassian/fisheye/config.xml b/files/opt/atlassian/fisheye/config.xml