From a74d551bd6428ccc73098d53cc7ec8de79b0d6b2 Mon Sep 17 00:00:00 2001 From: Timo Schwarzer Date: Thu, 1 Oct 2020 11:34:56 +0200 Subject: [PATCH] Install composer dependencies in Docker entrypoint --- dev/docker/entrypoint.app.sh | 3 ++- readme.md | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/docker/entrypoint.app.sh b/dev/docker/entrypoint.app.sh index ff44f0c8d..e91d34a71 100755 --- a/dev/docker/entrypoint.app.sh +++ b/dev/docker/entrypoint.app.sh @@ -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 \ No newline at end of file +fi diff --git a/readme.md b/readme.md index 7c2872a0a..bf6dfac2d 100644 --- a/readme.md +++ b/readme.md @@ -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 `admin@admin.com` 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 `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: @@ -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) \ No newline at end of file +* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml)