From 991aeb99f5a24374a5f37c4b23c63a04d5acd78f Mon Sep 17 00:00:00 2001
From: Jolse Maginnis <doolse@gmail.com>
Date: Tue, 18 Dec 2018 10:41:32 +1100
Subject: [PATCH] Don't need the folder name

---
 docker/.gitignore | 2 +-
 docker/Dockerfile | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker/.gitignore b/docker/.gitignore
index 06ac7d2e0d..3e0d2a07b2 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1 +1 @@
-equella-installer-6.5.zip
+equella-installer-*.zip
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a0a1f743b3..83816dd5fa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,13 +19,12 @@ FROM baseequella as installer
 
 # Install openEQUELLA
 
-ARG OEQ_INSTALL_FILE=equella-installer-6.7.zip
-ARG OEQ_INSTALL_ZIP_ROOT_DIR=equella-installer-6.7
+ARG OEQ_INSTALL_FILE=equella-installer-2018.2.zip
 
 COPY ["$OEQ_INSTALL_FILE","defaults.xml", "./"]
 
-RUN unzip $OEQ_INSTALL_FILE \
-    && mv $OEQ_INSTALL_ZIP_ROOT_DIR /equella-installer \
+RUN unzip $OEQ_INSTALL_FILE -d /tmp \
+    && mv /tmp/equella-installer-* /equella-installer \
     && java -jar /equella-installer/enterprise-install.jar --unsupported defaults.xml
 
 FROM baseequella as equella