From 3a61ff2eb49412d7cc9f050690b03e5585a80546 Mon Sep 17 00:00:00 2001
From: Shuai Lin <linshuai2012@gmail.com>
Date: Mon, 21 Nov 2016 11:31:45 +0800
Subject: [PATCH] Improve local Dockerfile.

---
 image/base/my_init.d/99_mysql_setup.sh |  2 +-
 templates/Dockerfile.template          | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/image/base/my_init.d/99_mysql_setup.sh b/image/base/my_init.d/99_mysql_setup.sh
index 35bacb3..0db9cde 100755
--- a/image/base/my_init.d/99_mysql_setup.sh
+++ b/image/base/my_init.d/99_mysql_setup.sh
@@ -22,7 +22,7 @@ if [[ ! -d /var/lib/mysql/mysql ]]; then
         sleep 1
     done
 
-    echo 'Setting root password to root'
+    echo 'Fixing root password'
     /usr/bin/mysqladmin -u root password ''
 
     # if [ -d /var/lib/mysql/setup ]; then
diff --git a/templates/Dockerfile.template b/templates/Dockerfile.template
index 7f1578e..fbeca9e 100644
--- a/templates/Dockerfile.template
+++ b/templates/Dockerfile.template
@@ -2,17 +2,17 @@
 # This is a jinja2 template to generate the real Dockerfile to build the local image
 FROM seafileorg/server:{{ seafile_version }}
 
-ADD scripts /scripts
-
-ADD bootstrap /bootstrap
-
-{%- if seafile_version <= '6.0.6' %}
-ADD scripts/tmp/check_init_admin.py /opt/seafile/seafile-server-{{ seafile_version }}/check_init_admin.py
-{%- endif %}
-
-{%- if https %}
-ADD bootstrap/generated/seafile.nginx.conf /etc/nginx/sites-enabled/seafile.nginx.conf
-ADD bootstrap/generated/letsencrypt.cron /etc/cron.d/letsencrypt.cron
-{%- endif %}
-
 CMD ["/sbin/my_init", "--", "/scripts/start.py"]
+
+ADD . /app
+
+RUN cp -rp /app/scripts /scripts && \
+    cp -rp /app/bootstrap /bootstrap && \
+{%- if seafile_version <= '6.0.6' %}
+    cp /app/scripts/tmp/check_init_admin.py /opt/seafile/seafile-server-{{ seafile_version }}/check_init_admin.py && \
+{%- endif %}
+{%- if https %}
+   cp /app/bootstrap/generated/seafile.nginx.conf /etc/nginx/sites-enabled/seafile.nginx.conf && \
+   cp /app/bootstrap/generated/letsencrypt.cron /etc/cron.d/letsencrypt.cron && \
+{%- endif %}
+   echo "Done"