Compare commits
5 Commits
2.0.0+1.33
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
4bb0a87b33
|
|||
| 22c3dbb9b8 | |||
| 74861fd9de | |||
| 6b47b3d040 | |||
| 3b2f17908f |
4
abra.sh
4
abra.sh
@ -3,7 +3,9 @@ APP_DIR="app:/data"
|
||||
|
||||
insert_vaultwarden_admin_token() {
|
||||
if ! command -v argon2 &> /dev/null; then
|
||||
echo "argon2 could not be found, please install it to proceed."
|
||||
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`"
|
||||
exit 1
|
||||
fi
|
||||
PASS=$(openssl rand 64 | openssl enc -A -base64)
|
||||
|
||||
@ -13,7 +13,7 @@ services:
|
||||
- db_password
|
||||
|
||||
db:
|
||||
image: "mariadb:10.6" # or "mysql"
|
||||
image: "mariadb:10.11" # or "mysql"
|
||||
environment:
|
||||
- MYSQL_DATABASE=vaultwarden
|
||||
- MYSQL_USER=vaultwarden
|
||||
@ -34,9 +34,9 @@ services:
|
||||
backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} < /var/lib/mysql/backup.sql'
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
|
||||
interval: 5s
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 0
|
||||
retries: 30
|
||||
start_period: 1m
|
||||
|
||||
secrets:
|
||||
|
||||
11
compose.yml
11
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: vaultwarden/server:1.33.2
|
||||
image: vaultwarden/server:1.34.3
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
@ -30,9 +30,10 @@ services:
|
||||
- vaultwarden_data:/data
|
||||
healthcheck:
|
||||
test: curl -f http://localhost/alive || exit 1
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 10
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 30
|
||||
start_period: 1m
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
@ -42,7 +43,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.0.0+1.33.2"
|
||||
- "coop-cloud.${STACK_NAME}.version=2.1.1+1.34.3"
|
||||
- "backupbot.backup=true"
|
||||
- "backupbot.backup.path=/data"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user