Improve sorting Shelf Books

[bookstack] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 63aa2b0c752aaafad9ac38256ffde7b207934625..ea7a61ab554aea7540a28655d0e9c61822550f8a 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'
 


@@ -20,15 +20,29 @@ services:
   app:
     build:
       context: .
   app:
     build:
       context: .

-      dockerfile: docker/dev/Dockerfile
+      dockerfile: ./dev/docker/Dockerfile
+    environment:
+      DB_CONNECTION: mysql
+      DB_HOST: db
+      DB_PORT: 3306
+      DB_DATABASE: bookstack-test
+      DB_USERNAME: bookstack-test
+      DB_PASSWORD: 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
+    entrypoint: /app/dev/docker/entrypoint.app.sh

   node:
     image: node:alpine
     working_dir: /app
     volumes:
       - ./:/app
   node:
     image: node:alpine
     working_dir: /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