From ed5823151bfafde02b85f70d5221ec8d9a8e0b21 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 7 Jun 2018 22:29:00 -0700 Subject: [PATCH] in order to avoid manual user intervention of running "php artisan migrate" before installation on a clean database pulling in migration scripts on startup if needed, also ownership of keys needs to be the docker user --- docker/entrypoint.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2fc2242649..0486302c93 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -17,12 +17,18 @@ else fi # create data directories -for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do +for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps' 'keys'; do mkdir -p "/var/lib/snipeit/$dir" done chown -R docker:root /var/lib/snipeit/data/* chown -R docker:root /var/lib/snipeit/dumps +chown -R docker:root /var/lib/snipeit/keys + +# If the Oauth DB files are not present copy the vendor files over to the db migrations +if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then + cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ +fi . /etc/apache2/envvars exec apache2 -DNO_DETACH < /dev/null