luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2298 from timoschwarzer/composer-install-in-entrypoint

Browse source 
Install composer dependencies in Docker entrypoint
This commit is contained in:
Dan Brown 2020-10-31 21:56:48 +00:00 committed by GitHub
commit 78be644332
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dev/docker/entrypoint.app.sh
View file

@ -7,8 +7,9 @@ env
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
exec "$@" exec "$@"
else else
composer install
wait-for-it db:3306 -t 45 wait-for-it db:3306 -t 45
php artisan migrate --database=mysql php artisan migrate --database=mysql
chown -R www-data:www-data storage chown -R www-data:www-data storage
exec apache2-foreground exec apache2-foreground
fi fi

13
readme.md
View file

@ -93,12 +93,11 @@ To get started, make sure you meet the following requirements:
If all the conditions are met, you can proceed with the following steps: If all the conditions are met, you can proceed with the following steps:
1. Install PHP/Composer dependencies with **`docker-compose run app composer install`** (first time can take a while because the image has to be built). 1. **Copy `.env.example` to `.env`**, change `APP_KEY` to a random 32 char string and set `APP_ENV` to `local`.
2. **Copy `.env.example` to `.env`** and change `APP_KEY` to a random 32 char string. 2. Make sure **port 8080 is unused** *or else* change `DEV_PORT` to a free port on your host.
3. Make sure **port 8080 is unused** *or else* change `DEV_PORT` to a free port on your host. 3. **Run `chgrp -R docker storage`**. The development container will chown the `storage` directory to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory.
4. **Run `chgrp -R docker storage`**. The development container will chown the `storage` directory to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory. 4. **Run `docker-compose up`** and wait until the image is built and all database migrations have been done.
5. **Run `docker-compose up`** and wait until all database migrations have been done. 5. You can now login with `admin@admin.com` and `password` as password on `localhost:8080` (or another port if specified).
6. You can now login with `admin@admin.com` and `password` as password on `localhost:8080` (or another port if specified).
If needed, You'll be able to run any artisan commands via docker-compose like so: If needed, You'll be able to run any artisan commands via docker-compose like so:
@ -170,4 +169,4 @@ These are the great open-source projects used to help build BookStack:
* [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) * [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html)
* [diagrams.net](https://github.com/jgraph/drawio) * [diagrams.net](https://github.com/jgraph/drawio)
* [Laravel Stats](https://github.com/stefanzweifel/laravel-stats) * [Laravel Stats](https://github.com/stefanzweifel/laravel-stats)
* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) * [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml)