Skip to content

Commit

Permalink
Merge pull request #2298 from timoschwarzer/composer-install-in-entry…
Browse files Browse the repository at this point in the history
…point

Install composer dependencies in Docker entrypoint
  • Loading branch information
ssddanbrown authored Oct 31, 2020
2 parents 6d8b060 + a74d551 commit 78be644
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
3 changes: 2 additions & 1 deletion dev/docker/entrypoint.app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ env
if [[ -n "$1" ]]; then
exec "$@"
else
composer install
wait-for-it db:3306 -t 45
php artisan migrate --database=mysql
chown -R www-data:www-data storage
exec apache2-foreground
fi
fi
13 changes: 6 additions & 7 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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).
2. **Copy `.env.example` to `.env`** and change `APP_KEY` to a random 32 char string.
3. Make sure **port 8080 is unused** *or else* change `DEV_PORT` to a free port on your host.
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.
5. **Run `docker-compose up`** and wait until all database migrations have been done.
6. You can now login with `[email protected]` and `password` as password on `localhost:8080` (or another port if specified).
1. **Copy `.env.example` to `.env`**, change `APP_KEY` to a random 32 char string and set `APP_ENV` to `local`.
2. 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 `docker-compose up`** and wait until the image is built and all database migrations have been done.
5. You can now login with `[email protected]` 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:

Expand Down Expand Up @@ -170,4 +169,4 @@ These are the great open-source projects used to help build BookStack:
* [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html)
* [diagrams.net](https://github.com/jgraph/drawio)
* [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)

0 comments on commit 78be644

Please sign in to comment.