X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/712ea21efe8647f42a6f21ef9d0324ad7794dcc2..refs/pull/3433/head:/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index ea7a61ab5..13648c121 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,24 +10,27 @@ services: db: image: mysql:8 environment: - MYSQL_DATABASE: bookstack-test + MYSQL_DATABASE: bookstack-dev MYSQL_USER: bookstack-test MYSQL_PASSWORD: bookstack-test MYSQL_RANDOM_ROOT_PASSWORD: 'true' command: --default-authentication-plugin=mysql_native_password volumes: + - ./dev/docker/init.db:/docker-entrypoint-initdb.d - db:/var/lib/mysql app: build: context: . dockerfile: ./dev/docker/Dockerfile environment: + APP_URL: http://localhost:${DEV_PORT:-8080} DB_CONNECTION: mysql DB_HOST: db DB_PORT: 3306 - DB_DATABASE: bookstack-test + DB_DATABASE: bookstack-dev DB_USERNAME: bookstack-test DB_PASSWORD: bookstack-test + TEST_DATABASE_URL: mysql://bookstack-test:bookstack-test@db/bookstack-test MAIL_DRIVER: smtp MAIL_HOST: mailhog MAIL_PORT: 1025 @@ -35,10 +38,14 @@ services: - ${DEV_PORT:-8080}:80 volumes: - ./:/app + - ./dev/docker/php/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini entrypoint: /app/dev/docker/entrypoint.app.sh + extra_hosts: + - "host.docker.internal:host-gateway" node: image: node:alpine working_dir: /app + user: node volumes: - ./:/app entrypoint: /app/dev/docker/entrypoint.node.sh