Guest create page: name field autofocus

[bookstack] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 26f783cb6986564ffd90d1144cfde4e73221e33f..13648c12176463301a7835c70ec35205741c335e 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 # This is a Docker Compose configuration
 # This is a Docker Compose configuration

-# intended for development purposes
+# intended for development purposes only

 
 version: '3'
 
 
 version: '3'
 


@@ -10,32 +10,46 @@ services:
   db:
     image: mysql:8
     environment:
   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:
       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: .
       - db:/var/lib/mysql
   app:
     build:
       context: .

-      dockerfile: docker/dev/Dockerfile
+      dockerfile: ./dev/docker/Dockerfile

     environment:
     environment:

+      APP_URL: http://localhost:${DEV_PORT:-8080}

       DB_CONNECTION: mysql
       DB_HOST: db
       DB_PORT: 3306
       DB_CONNECTION: mysql
       DB_HOST: db
       DB_PORT: 3306

-      DB_DATABASE: bookstack-test
-      DB_USER: bookstack-test
+      DB_DATABASE: bookstack-dev
+      DB_USERNAME: bookstack-test

       DB_PASSWORD: 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

     ports:
     ports:

-      - ${DEV_PORT}:80
+      - ${DEV_PORT:-8080}:80

     volumes:
       - ./:/app
     volumes:
       - ./:/app

-    entrypoint: /app/docker/dev/entrypoint.app.sh
+      - ./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
   node:
     image: node:alpine
     working_dir: /app

+    user: node

     volumes:
       - ./:/app
     volumes:
       - ./:/app

-    entrypoint: /app/docker/dev/entrypoint.node.sh
+    entrypoint: /app/dev/docker/entrypoint.node.sh
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+      - ${DEV_MAIL_PORT:-8025}:8025