From d3c3cb0c1f6bdf73078f58e2f2a2c6cc4ddf8bd7 Mon Sep 17 00:00:00 2001
From: Felix Breidenstein <mail@felixbreidenstein.de>
Date: Tue, 20 Feb 2018 12:23:52 +0100
Subject: [PATCH] Dockerfile: Better handling of entrypoint.sh

---
 Dockerfile           | 4 +++-
 docker/entrypoint.sh | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c7d45ba..7bc9e12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,9 @@ RUN apt-get update && apt-get install -y \
 COPY . /var/www/html
 
 # Copy start script
-COPY docker/entrypoint.sh /
+RUN mv /var/www/html/docker/entrypoint.sh / && \
+    rm -r /var/www/html/docker
+
 VOLUME /var/www/html/data
 
 CMD /entrypoint.sh
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 6d2df63..124f2ea 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,5 +1,4 @@
 #! /bin/sh
 
 chown -R www-data /var/www/html/data
-rm -r /var/www/html/docker
 apache2-foreground