1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-29 23:22:34 +01:00

Alter docker paths

This commit is contained in:
Timo Schwarzer 2019-08-12 22:19:58 +02:00
parent b608bb8859
commit c6b1f36412
No known key found for this signature in database
GPG Key ID: C4062DA320280737
4 changed files with 12 additions and 10 deletions

View File

@ -19,23 +19,23 @@ services:
- db:/var/lib/mysql
app:
build:
context: .
dockerfile: docker/dev/Dockerfile
context: ..
dockerfile: ./dev/docker/Dockerfile
environment:
DB_CONNECTION: mysql
DB_HOST: db
DB_PORT: 3306
DB_DATABASE: bookstack-test
DB_USER: bookstack-test
DB_USERNAME: bookstack-test
DB_PASSWORD: bookstack-test
ports:
- ${DEV_PORT}:80
- ${DEV_PORT:-8080}:80
volumes:
- ./:/app
entrypoint: /app/docker/dev/entrypoint.app.sh
- ../:/app
entrypoint: /app/dev/docker/entrypoint.app.sh
node:
image: node:alpine
working_dir: /app
volumes:
- ./:/app
entrypoint: /app/docker/dev/entrypoint.node.sh
- ../:/app
entrypoint: /app/dev/docker/entrypoint.node.sh

View File

@ -2,11 +2,13 @@
set -e
if [[ "$1" == "composer" ]]; then
env
if [[ -n "$1" ]]; then
exec "$@"
else
wait-for-it db:3306 -t 45
php artisan migrate --database=mysql_docker_dev
php artisan migrate --database=mysql
chown -R www-data:www-data storage
exec apache2-foreground
fi