From e4dfb188fa5cb92fa9c1450f288f568d35012d59 Mon Sep 17 00:00:00 2001 From: Petr Baloun Date: Thu, 31 Mar 2016 13:05:56 +0200 Subject: [PATCH] Created data volume, redirected data directories there --- Dockerfile | 12 ++++++++++++ docker/entrypoint.sh | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/Dockerfile b/Dockerfile index 935d45ebf7..59da766bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,13 @@ COPY docker/*.php /var/www/html/app/config/production/ RUN chown -R docker /var/www/html +RUN \ + rm -r "/var/www/html/app/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/app/private_uploads" && \ + rm -r "/var/www/html/public/uploads/avatars" && ln -fs "/var/lib/snipeit/data/uploads/avatars" "/var/www/html/public/uploads/avatars" && \ + rm -r "/var/www/html/public/uploads/models" && ln -fs "/var/lib/snipeit/data/uploads/models" "/var/www/html/public/uploads/models" && \ + rm -r "/var/www/html/public/uploads/suppliers" && ln -fs "/var/lib/snipeit/data/uploads/suppliers" "/var/www/html/public/uploads/suppliers" && \ + rm -r "/var/www/html/app/storage/dumps" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/app/storage/dumps" + ############## DEPENDENCIES via COMPOSER ################### #global install of composer @@ -67,6 +74,11 @@ RUN cd /var/www/html;composer install #RUN chmod +x /tmp/app_install.exp #RUN /tmp/app_install.exp +############### DATA VOLUME ################# + +RUN mkdir /var/lib/snipeit +VOLUME [/var/lib/snipeit] + ##### START SERVER COPY docker/entrypoint.sh /entrypoint.sh diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 014d759817..b23f1eaca8 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -15,5 +15,13 @@ else a2dismod ssl fi +# create data directories +for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do + mkdir -p "/var/lib/snipeit/$dir" +done + +chown -R docker:root /var/lib/snipeit/data/* +chown -R docker:root /var/lib/snipeit/dumps + . /etc/apache2/envvars exec apache2 -DNO_DETACH < /dev/null