vikarti.anatra/seafile-containerized
1
0
Fork 0
mirror of https://github.com/ggogel/seafile-containerized.git synced 2024-11-16 17:05:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve local Dockerfile.

Browse source
This commit is contained in:
Shuai Lin 2016-11-21 11:31:45 +08:00
parent 500e8a9d15
commit 3a61ff2eb4
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
image/base/my_init.d/99_mysql_setup.sh
View file

@ -22,7 +22,7 @@ if [[ ! -d /var/lib/mysql/mysql ]]; then
sleep 1 sleep 1
done done
echo 'Setting root password to root' echo 'Fixing root password'
/usr/bin/mysqladmin -u root password '' /usr/bin/mysqladmin -u root password ''
# if [ -d /var/lib/mysql/setup ]; then # if [ -d /var/lib/mysql/setup ]; then

26
templates/Dockerfile.template
View file

@ -2,17 +2,17 @@
# This is a jinja2 template to generate the real Dockerfile to build the local image # This is a jinja2 template to generate the real Dockerfile to build the local image
FROM seafileorg/server:{{ seafile_version }} 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"] 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"