From b0eec3696ba77b0819f550efdd35168d3e0a7c05 Mon Sep 17 00:00:00 2001
From: Kamil Manka <kamil.manka@seamless.se>
Date: Wed, 23 Dec 2015 10:47:16 +0100
Subject: [PATCH] Copy instead of mv.

---
 .gitignore        | 1 +
 Dockerfile        | 9 ++++++---
 get_prestashop.sh | 9 ---------
 run.sh            | 8 ++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 .gitignore
 delete mode 100755 get_prestashop.sh
 create mode 100755 run.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1269488
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data
diff --git a/Dockerfile b/Dockerfile
index 920a244..c3b94eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,13 @@ MAINTAINER Kamil Manka <kamil.manka@seamless.se>
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install unzip curl
 
-ADD get_prestashop.sh /get_prestashop.sh
-RUN chmod +x /get_prestashop.sh
+ADD run.sh /run.sh
+RUN chmod +x /run.sh
 RUN mkdir -p /var/www/html
 
+# SEQR plugin directory
+RUN mkdir -p /var/www/html/modules/seqr
+
 # apache config
 ENV APACHE_RUN_USER www-data
 ENV APACHE_RUN_GROUP www-data
@@ -14,4 +17,4 @@ RUN chown -R www-data:www-data /var/www/
 
 VOLUME /var/www/html
 
-CMD ["/get_prestashop.sh"]
+CMD ["/run.sh"]
diff --git a/get_prestashop.sh b/get_prestashop.sh
deleted file mode 100755
index b36dbf5..0000000
--- a/get_prestashop.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-curl -s -o /tmp/temp "https://www.prestashop.com/download/old/prestashop_$PS_VERSION.zip"
-unzip -q /tmp/temp -d /var/www/html
-mv /var/www/html/prestashop/* /var/www/html
-rm -rf /var/www/html/prestashop
-rm /tmp/temp
-chown -R www-data:www-data /var/www\
-
-while true; do true; done
diff --git a/run.sh b/run.sh
new file mode 100755
index 0000000..a23680d
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+curl -s -o /tmp/temp "https://www.prestashop.com/download/old/prestashop_$PS_VERSION.zip"
+unzip -q /tmp/temp -d /tmp
+cp -rf /tmp/prestashop/* /var/www/html
+rm -rf /tmp/*
+chown -R www-data:www-data /var/www
+
+while true; do true; done;
-- 
GitLab