Skip to content

Fix issue in compose files when using default APP_KEY #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjhenry merged 2 commits into from
Jul 20, 2023
Merged

Fix issue in compose files when using default APP_KEY #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc73ba
Fix bad APP_KEY in Docker Compose files
rjhenry Jul 20, 2023
7b6ea28
Fix typo in Dockerfile
rjhenry Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
- mysql
environment:
- APP_URL=http://localhost:${DEV_PORT:-8080}
- APP_KEY=SomeRandomString
- APP_KEY=SomeRandomStringWith32Characters
- DB_HOST=mysql:3306
- DB_DATABASE=bookstack
- DB_USERNAME=bookstack
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
# APP_KEY is used for encryption where needed, so needs to be persisted to
# preserve decryption abilities.
# Can run `php artisan key:generate` to generate a key
- APP_KEY=SomeRandomString
- APP_KEY=SomeRandomStringWith32Characters
volumes:
- uploads:/var/www/bookstack/public/uploads
- storage-uploads:/var/www/bookstack/storage/uploads
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ check_vars_exist() {
IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST"
DB_PORT=${DB_PORT:-3306}

# Ensure these is no local .env file
# Ensure there is no local .env file
if [ -f ".env" ]; then
mv .env .env.bak
echoerr ".env file detected - moved to .env.bak"
Expand Down