4lt/docker-compose-cookbooks
1
0
Fork 0
mirror of https://github.com/nickyeoman/docker-compose-cookbooks.git synced 2026-09-04 02:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bookstack cleaned

Browse Source
This commit is contained in:
nick
2024-07-26 11:33:24 -07:00
parent 2f1c6757c8
commit 351bbada86
5 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_builder/dc-env.sh
+2 -2
View File
@@ -8,8 +8,8 @@ process_env_vars() {
# Loop through each environment variable # Loop through each environment variable
while IFS= read -r env_var; do while IFS= read -r env_var; do
# Split into name and value parts based on '=' # Split into name and value parts based on '='
var_name="${env_var%%:*}" # Variable name (split by colon for YAML) var_name="${env_var%%=*}" # Variable name
var_value="${env_var#*: }" # Variable value (remove leading space) var_value="${env_var#*=}" # Variable value
# Handle variables without existing braces (not previously processed) # Handle variables without existing braces (not previously processed)
if [[ "$var_value" != *'${'* ]]; then if [[ "$var_value" != *'${'* ]]; then
_builder/parse.bash
+2 -3
View File
@@ -15,12 +15,11 @@ get_env_vars() {
local compose_content="$1" local compose_content="$1"
local env_vars="" local env_vars=""
# Use yq to extract the environment variables in 'key: value' format # Use yq to extract environment variables in 'key=value' format without indices
env_vars=$(echo "$compose_content" | yq eval '.services.*.environment | to_entries | .[] | "\(.key): \(.value)"' - 2>/dev/null) env_vars=$(echo "$compose_content" | yq eval '.services.*.environment[]' - 2>/dev/null)
echo "$env_vars" echo "$env_vars"
} }
get_image() { get_image() {
local compose_content="$1" local compose_content="$1"
local images="" local images=""
bookstack/docker-compose.yml
+13 -13
View File
@@ -1,20 +1,20 @@
version: '3.8' version: '3.8'
services: services:
bookstack: bookstack:
image: ${BOOKSTACK_IMAGE:-solidnerd/bookstack:latest} image: ${BOOKSTACK_IMAGE:-solidnerd/bookstack:latest}
restart: unless-stopped
environment: environment:
- DB_HOST=bookstack-db:3306 - APP_KEY: ${BOOKSTACK_APP_KEY:-APP_KEY}
- DB_DATABASE=dbuser - APP_TIMEZONE: ${BOOKSTACK_APP_TIMEZONE:-America/Vancouver}
- DB_USERNAME=dbuser - APP_URL: ${BOOKSTACK_APP_URL:-http://localhost:8248}
- DB_PASSWORD=dbpass - DB_DATABASE: ${BOOKSTACK_DB_DATABASE:-dbname}
- APP_URL=${APP_URL:-http://localhost:8248} - DB_HOST: ${BOOKSTACK_DB_HOST:-bookstack-mariadb:3306}
- REVISION_LIMIT=false - DB_PASSWORD: ${BOOKSTACK_DB_PASSWORD:-dbpass}
- APP_KEY=APP_KEY - DB_USERNAME: ${BOOKSTACK_DB_USERNAME:-dbuser}
- APP_TIMEZONE=America/Vancouver - REVISION_LIMIT: ${BOOKSTACK_REVISION_LIMIT:-false}
volumes: volumes:
- "/etc/timezone:/etc/timezone:ro" - ${VOL_CONFIG_PATH:-./config}/php.ini:/usr/local/etc/php/php.ini
- ./data/uploads:/var/www/bookstack/public/uploads - ${VOL_PATH:-./data}/storage:/var/www/bookstack/storage/uploads
- ./data/storage:/var/www/bookstack/storage/uploads - ${VOL_PATH:-./data}/uploads:/var/www/bookstack/public/uploads
- ./config/php.ini:/usr/local/etc/php/php.ini - /etc/timezone:/etc/timezone:ro
bookstack/sample.env
+13 -6
View File
@@ -1,7 +1,14 @@
# Bookstack App COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
PRODDIR=/var/www/stashdomain-com/ #HELP: project_path
COOKBOOK=/home/user/git/docker-compose-cookbooks #HELP: cookbooks # bookstack
VOL_PATH=/project-dir/project-name/data #HELP: volpath BOOKSTACK_APP_KEY=APP_KEY #HELP: gen32
# Bookstack Container 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_DB_USERNAME=dbuser
BOOKSTACK_IMAGE=solidnerd/bookstack:latest BOOKSTACK_IMAGE=solidnerd/bookstack:latest
APP_KEY=012345679801234567980123645678921 #HELP: gen32 BOOKSTACK_REVISION_LIMIT=false
VOL_CONFIG_PATH=./config #HELP: configpath
VOL_PATH=./data #HELP: volpath
builder.bash
+5
View File
@@ -58,7 +58,12 @@ BLDR_DC_VOLS=$(process_volumes "$BLDR_DC_VOLS")
# Clean up ENV # Clean up ENV
################################################ ################################################
source ./_builder/dc-env.sh source ./_builder/dc-env.sh
# echo "*** Pre process **"
# echo "$BLDR_DC_ENV"
BLDR_DC_ENV=$(process_env_vars "$BLDR_DC_ENV" "$BLDR_APP") BLDR_DC_ENV=$(process_env_vars "$BLDR_DC_ENV" "$BLDR_APP")
# echo "*** Post **"
# echo "$BLDR_DC_ENV"
# exit
################################################ ################################################
# Compile New Docker Var BLDR_NEW_DCF # Compile New Docker Var BLDR_NEW_DCF