larsven
diff --git a/‎.env.example
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎.env.example
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎Dockerfile
Copy file name to clipboardExpand all lines: Dockerfile
+2-2Lines changed: 2 additions & 2 deletions b/‎Dockerfile
Copy file name to clipboardExpand all lines: Dockerfile
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile
Copy file name to clipboardExpand all lines: Makefile
-37Lines changed: 0 additions & 37 deletions b/‎Makefile
Copy file name to clipboardExpand all lines: Makefile
-37Lines changed: 0 additions & 37 deletions
diff --git a/‎VERSION
Copy file name to clipboardExpand all lines: VERSION
-1Lines changed: 0 additions & 1 deletion b/‎VERSION
Copy file name to clipboardExpand all lines: VERSION
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎docker-compose.yml
Copy file name to clipboardExpand all lines: docker-compose.yml
+9-12Lines changed: 9 additions & 12 deletions b/‎docker-compose.yml
Copy file name to clipboardExpand all lines: docker-compose.yml
+9-12Lines changed: 9 additions & 12 deletions
@@ -0,0 +1,13 @@
+DB_ROOT_PASSWORD=
+DB_PASSWORD=
+
+MAIL_HOST=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_FROM=
+MAIL_FROM_NAME=
+
+APP_URL=
+
+VOLUMES_ROOT_PATH=/opt/docs
+RESTART_MODE=unless-stopped
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=22.07.2
+ENV BOOKSTACK_VERSION=22.07.3
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \
@@ -56,7 +56,7 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf
 
 COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/
 
-ARG COMPOSER_VERSION=2.1.12
+ARG COMPOSER_VERSION=2.2.18
 RUN set -x; \
     cd /var/www/bookstack \
     && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
 
@@ -2,31 +2,28 @@ version: "3"
 services:
   database:
     image: mariadb:10.5
+    restart: ${RESTART_MODE}
     environment:
-    - MYSQL_ROOT_PASSWORD=secret
+    - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
     - MYSQL_DATABASE=bookstack
     - MYSQL_USER=bookstack
-    - MYSQL_PASSWORD=secret
+    - MYSQL_PASSWORD=${DB_PASSWORD}
     volumes:
-    - database-data:/var/lib/mysql
+    - ${VOLUMES_ROOT_PATH}/database-data:/var/lib/mysql
 
   bookstack:
     build: ./
+    restart: ${RESTART_MODE}
     depends_on:
     - database
     environment:
     - DB_HOST=database:3306
     - DB_DATABASE=bookstack
     - DB_USERNAME=bookstack
-    - DB_PASSWORD=secret
-    - APP_URL=http://localhost:8080
+    - DB_PASSWORD=${DB_PASSWORD}
+    - APP_URL=${APP_URL}
     volumes:
-    - uploads:/var/www/bookstack/public/uploads
-    - storage-uploads:/var/www/bookstack/storage/uploads
+    - ${VOLUMES_ROOT_PATH}/uploads:/var/www/bookstack/public/uploads
+    - ${VOLUMES_ROOT_PATH}/storage-uploads:/var/www/bookstack/storage/uploads
     ports:
     - "8080:8080"
-
-volumes:
- database-data:
- uploads:
- storage-uploads: