Reverted shift change to old migration

[bookstack] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 63aa2b0c752aaafad9ac38256ffde7b207934625..7920258944694e6b0d1af757ba9fd3bef5b45e57 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 # This is a Docker Compose configuration
-# intended for development purposes
+# intended for development purposes only
 
 version: '3'
 
@@ -10,25 +10,43 @@ 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: docker/dev/Dockerfile
+      dockerfile: ./dev/docker/Dockerfile
+    environment:
+      APP_URL: http://localhost:${DEV_PORT:-8080}
+      DB_CONNECTION: mysql
+      DB_HOST: db
+      DB_PORT: 3306
+      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
     ports:
-      - ${DEV_PORT}:80
+      - ${DEV_PORT:-8080}:80
     volumes:
       - ./:/app
-    entrypoint: /app/docker/dev/entrypoint.app.sh
+    entrypoint: /app/dev/docker/entrypoint.app.sh
   node:
     image: node:alpine
     working_dir: /app
+    user: node
     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