converting projects to portainer ready

bookstack/README.md

@@ -1,6 +1,14 @@
 # Bookstack
 
-Dockerhub: https://hub.docker.com/r/solidnerd/bookstack
-Docker Compose: https://github.com/solidnerd/docker-bookstack/blob/master/docker-compose.yml
+## Overview
+
+BookStack is a self-hosted wiki platform for organizing and storing documentation in a simple, book/chapter/page structure. This Docker Compose stack allows easy deployment with persistent storage.
+
+## Project Details
+
+-   **Project Repository:** [Bookstack Official](https://www.bookstackapp.com/)
+-   **Container Image:** [Docker Hub](https://hub.docker.com/r/solidnerd/bookstack)
+-   **Compose Example:** [Compose](https://github.com/solidnerd/docker-bookstack/blob/master/docker-compose.yml)
+-   **Documentation:** [Docs](https://www.bookstackapp.com/docs/)
+-   **Reverse Proxy Port:** `8080`
 
-Reverse Proxy Port: 8080

bookstack/docker-compose.yml

@@ -2,16 +2,49 @@ services:
   bookstack:
     image: ${BOOKSTACK_IMAGE:-solidnerd/bookstack:latest}
     restart: unless-stopped
+    depends_on:
+      - mariadb
+    volumes:
+      - bookstack-php-config:/usr/local/etc/php/php.ini
+      - bookstack-storage:/var/www/bookstack/storage/uploads
+      - bookstack-uploads:/var/www/bookstack/public/uploads
     environment:
       - APP_KEY=${BOOKSTACK_APP_KEY:-APP_KEY}
       - APP_TIMEZONE=${BOOKSTACK_APP_TIMEZONE:-America/Vancouver}
       - APP_URL=${BOOKSTACK_APP_URL:-http://localhost:8080}
-      - DB_DATABASE=${BOOKSTACK_DB_DATABASE:-dbname}
-      - DB_HOST=${BOOKSTACK_DB_HOST:-bookstack-mariadb:3306}
+      - DB_DATABASE=${BOOKSTACK_DB_DATABASE:-bookstack}
+      - DB_HOST=mariadb:3306
       - DB_PASSWORD=${BOOKSTACK_DB_PASSWORD:-dbpass}
       - DB_USERNAME=${BOOKSTACK_DB_USERNAME:-dbuser}
       - REVISION_LIMIT=${BOOKSTACK_REVISION_LIMIT:-false}
+    ports:
+      - "8080:8080"
+    networks:
+      - proxy
+      - internal
+
+  mariadb:
+    image: ${MARIADB_IMAGE:-mariadb:latest}
+    restart: unless-stopped
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed
+    environment:
+      - MARIADB_DATABASE=${MARIADB_MARIADB_DATABASE:-bookstack}
+      - MARIADB_ROOT_PASSWORD=${MARIADB_MARIADB_ROOT_PASSWORD:-ChangeThisPassword}
+      - MARIADB_USER=${MARIADB_MARIADB_USER:-dbuser}
+      - MARIADB_PASSWORD=${MARIADB_MARIADB_PASSWORD:-AlsoChangeThisPassword}
     volumes:
-      - ${VOL_CONFIG_PATH:-./config}/php.ini:/usr/local/etc/php/php.ini
-      - ${VOL_PATH:-./data}/bookstack-storage:/var/www/bookstack/storage/uploads
-      - ${VOL_PATH:-./data}/bookstack-uploads:/var/www/bookstack/public/uploads
+      - mariadb-data:/var/lib/mysql
+    networks:
+      - internal
+
+volumes:
+  bookstack-php-config:
+  bookstack-storage:
+  bookstack-uploads:
+  mariadb-data:
+
+networks:
+  proxy:
+    external: true
+  internal:
+    external: true

bookstack/sample.env

@@ -1,14 +1,18 @@
-COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
-VOL_CONFIG_PATH=./config #HELP: configpath
-VOL_PATH=./data #HELP: volpath
-
 # Bookstack
-BOOKSTACK_APP_KEY=APP_KEY #HELP: gen32
+BOOKSTACK_APP_KEY=APP_KEY
 BOOKSTACK_APP_TIMEZONE=America/Vancouver
-BOOKSTACK_APP_URL=http://localhost:8248
-BOOKSTACK_DB_DATABASE=dbname
-BOOKSTACK_DB_HOST=bookstack-db:3306
-BOOKSTACK_DB_PASSWORD=dbpass #HELP: gen32
+BOOKSTACK_APP_URL=http://localhost:8080
+BOOKSTACK_DB_DATABASE=bookstack
+BOOKSTACK_DB_HOST=mariadb:3306
+BOOKSTACK_DB_PASSWORD=dbpass
 BOOKSTACK_DB_USERNAME=dbuser
 BOOKSTACK_IMAGE=solidnerd/bookstack:latest
 BOOKSTACK_REVISION_LIMIT=false
+
+# MariaDB
+MARIADB_IMAGE=mariadb:latest
+MARIADB_MARIADB_DATABASE=bookstack
+MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword
+MARIADB_MARIADB_USER=dbuser
+MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword
+