Commit 5084120

authored

Merge pull request #422 from solidnerd/rjh_remove_entrypoint_script

Fix issue in compose files when using default APP_KEY

2 parents fc5bea8 + 7b6ea28 commit 5084120Copy full SHA for 5084120

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ services:`
`21`	`21`	`- mysql`
`22`	`22`	`environment:`
`23`	`23`	`- APP_URL=http://localhost:${DEV_PORT:-8080}`
`24`		`- - APP_KEY=SomeRandomString`
	`24`	`+ - APP_KEY=SomeRandomStringWith32Characters`
`25`	`25`	`- DB_HOST=mysql:3306`
`26`	`26`	`- DB_DATABASE=bookstack`
`27`	`27`	`- DB_USERNAME=bookstack`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ services:`
`24`	`24`	`# APP_KEY is used for encryption where needed, so needs to be persisted to`
`25`	`25`	`# preserve decryption abilities.`
`26`	`26`	# Can run `php artisan key:generate` to generate a key
`27`		`- - APP_KEY=SomeRandomString`
	`27`	`+ - APP_KEY=SomeRandomStringWith32Characters`
`28`	`28`	`volumes:`
`29`	`29`	`- uploads:/var/www/bookstack/public/uploads`
`30`	`30`	`- storage-uploads:/var/www/bookstack/storage/uploads`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ check_vars_exist() {`
`18`	`18`	`IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST"`
`19`	`19`	`DB_PORT=${DB_PORT:-3306}`
`20`	`20`
`21`		`-# Ensure these is no local .env file`
	`21`	`+# Ensure there is no local .env file`
`22`	`22`	`if [ -f ".env" ]; then`
`23`	`23`	`mv .env .env.bak`
`24`	`24`	`echoerr ".env file detected - moved to .env.bak"`

Comments

(0)