Compare commits

..

No commits in common. "main" and "smtp-not-enabled-by-default" have entirely different histories.

3 changed files with 4 additions and 6 deletions

View File

@ -3,9 +3,7 @@ APP_DIR="app:/data"
insert_vaultwarden_admin_token() {
if ! command -v argon2 &> /dev/null; then
echo "argon2 is required on your local machine to hash the admin token."
echo "It could not be found in your PATH, please install argon2 to proceed."
echo "For example: On a debian/ubuntu system, run `apt install argon2`"
echo "argon2 could not be found, please install it to proceed."
exit 1
fi
PASS=$(openssl rand 64 | openssl enc -A -base64)

View File

@ -13,7 +13,7 @@ services:
- db_password
db:
image: "mariadb:10.11" # or "mysql"
image: "mariadb:10.6" # or "mysql"
environment:
- MYSQL_DATABASE=vaultwarden
- MYSQL_USER=vaultwarden

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: vaultwarden/server:1.34.1
image: vaultwarden/server:1.33.2
networks:
- proxy
- internal
@ -42,7 +42,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=2.1.0+1.34.1"
- "coop-cloud.${STACK_NAME}.version=2.0.0+1.33.2"
- "backupbot.backup=true"
- "backupbot.backup.path=/data"