From 813721250d6b3e4a7be8a0c0c90b6e9803991895 Mon Sep 17 00:00:00 2001 From: Roland Vet Date: Thu, 18 Nov 2021 15:49:35 +0100 Subject: [PATCH 1/4] Bitwarden-rs has been renamed to Vaultwarden Update references to use Bitwarden-rs has been renamed to Vaultwarden bitwarden-rs->vaultwarden name change in root.json --- bitwarden-rs-alpine.json | 41 ---------------------------------------- root.json | 2 +- vaultwarden-alpine.json | 41 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 bitwarden-rs-alpine.json create mode 100644 vaultwarden-alpine.json diff --git a/bitwarden-rs-alpine.json b/bitwarden-rs-alpine.json deleted file mode 100644 index 5a404998..00000000 --- a/bitwarden-rs-alpine.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "Bitwarden-rs": { - "description": "Bitwarden password manager server in Rust and on Alpine (speed, size).

Based on the following docker image: https://hub.docker.com/r/bitwardenrs/server

.", - "version": "0.0.1", - "website": "https://github.com/dani-garcia/bitwarden_rs", - "more_info": "SSL/TLS certs and keys required. They must be placed in the Rockstor share used as Bitwarden-rs cert storage during the rock-on's installation process:

Of note, certs.pem can be a chain. Need a cert? Try mkcert or openssl.", - "ui": { - "https": true, - "slug": "" - }, - "containers": { - "bitwarden-rs": { - "image": "bitwardenrs/server", - "tag": "alpine", - "launch_order": 1, - "ports": { - "80": { - "description": "Admin interface", - "label": "Admin interface", - "host_default": 80, - "protocol": "tcp", - "ui": true - } - }, - "volumes": { - "/data": { - "description": "Where all bitwarden-rs data will be stored", - "label": "Bitwarden-rs storage" - }, - "/ssl": { - "description": "SSL cert/key location to enable ssl", - "label": "Bitwarden-rs cert storage" - } - }, - "opts": [ - ["-e", "ROCKET_TLS={certs=\"/ssl/certs.pem\",key=\"/ssl/key.pem\"}"] - ] - } - } - } -} diff --git a/root.json b/root.json index b7180839..266ba96d 100644 --- a/root.json +++ b/root.json @@ -1,6 +1,5 @@ { "Bitcoin": "bitcoind.json", - "Bitwarden-rs": "bitwarden-rs-alpine.json", "Booksonic": "booksonic.json", "Cardigann": "cardigann.json", "Collabora Online": "collabora-online.json", @@ -81,6 +80,7 @@ "Ubiquiti Unifi linuxserver.io": "unifi-linuxserver.json", "Unifi Controller": "unifi.json", "uTorrent": "uTorrent.json", + "Vaultwarden": "vaultwarden-alpine.json", "Watchtower offical": "watchtower_official.json", "Xeoma Video Surveillance": "xeoma.json", "YouTrack official": "youtrack-official.json", diff --git a/vaultwarden-alpine.json b/vaultwarden-alpine.json new file mode 100644 index 00000000..6631c22d --- /dev/null +++ b/vaultwarden-alpine.json @@ -0,0 +1,41 @@ +{ + "Vaultwarden": { + "description": "Alternative implementation of the Bitwarden password manager server API written in Rust and on Alpine (speed, size).

Based on the following docker image: https://hub.docker.com/r/vaultwarden/server

.", + "version": "0.0.1", + "website": "https://github.com/dani-garcia/vaultwarden", + "more_info": "SSL/TLS certs and keys required. They must be placed in the Rockstor share used as Vaultwarden cert storage during the rock-on's installation process:

Of note, certs.pem can be a chain. Need a cert? Try mkcert or openssl.", + "ui": { + "https": true, + "slug": "" + }, + "containers": { + "vaultwarden": { + "image": "vaultwarden/server", + "tag": "alpine", + "launch_order": 1, + "ports": { + "80": { + "description": "Admin interface", + "label": "Admin interface", + "host_default": 80, + "protocol": "tcp", + "ui": true + } + }, + "volumes": { + "/data": { + "description": "Where all vaultwarden data will be stored", + "label": "Vaultwarden storage" + }, + "/ssl": { + "description": "SSL cert/key location to enable ssl", + "label": "Vaultwarden cert storage" + } + }, + "opts": [ + ["-e", "ROCKET_TLS={certs=\"/ssl/certs.pem\",key=\"/ssl/key.pem\"}"] + ] + } + } + } +} From ce179ff162445ca4a9536557f2a4e41c157f00ca Mon Sep 17 00:00:00 2001 From: Roland Vet Date: Tue, 30 Nov 2021 07:27:30 +0900 Subject: [PATCH 2/4] Switch to vaultwarden to latest tag Update and rename vaultwarden-alpine.json to vaultwarden.json . Fixes #298 Update root.json to match vaultwarden tag change --- root.json | 2 +- vaultwarden-alpine.json => vaultwarden.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename vaultwarden-alpine.json => vaultwarden.json (98%) diff --git a/root.json b/root.json index 266ba96d..c5b492e6 100644 --- a/root.json +++ b/root.json @@ -80,7 +80,7 @@ "Ubiquiti Unifi linuxserver.io": "unifi-linuxserver.json", "Unifi Controller": "unifi.json", "uTorrent": "uTorrent.json", - "Vaultwarden": "vaultwarden-alpine.json", + "Vaultwarden": "vaultwarden.json", "Watchtower offical": "watchtower_official.json", "Xeoma Video Surveillance": "xeoma.json", "YouTrack official": "youtrack-official.json", diff --git a/vaultwarden-alpine.json b/vaultwarden.json similarity index 98% rename from vaultwarden-alpine.json rename to vaultwarden.json index 6631c22d..1887282e 100644 --- a/vaultwarden-alpine.json +++ b/vaultwarden.json @@ -11,7 +11,7 @@ "containers": { "vaultwarden": { "image": "vaultwarden/server", - "tag": "alpine", + "tag": "latest", "launch_order": 1, "ports": { "80": { From 753145255e9193b8bdfb18c06618fd74aeed192a Mon Sep 17 00:00:00 2001 From: Roland Vet Date: Sun, 26 Dec 2021 07:44:41 +0100 Subject: [PATCH 3/4] Explicitly mention compatible architectures Co-authored-by: FroggyFlox <30297881+FroggyFlox@users.noreply.github.com> --- vaultwarden.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaultwarden.json b/vaultwarden.json index 1887282e..d4945a5b 100644 --- a/vaultwarden.json +++ b/vaultwarden.json @@ -1,6 +1,6 @@ { "Vaultwarden": { - "description": "Alternative implementation of the Bitwarden password manager server API written in Rust and on Alpine (speed, size).

Based on the following docker image: https://hub.docker.com/r/vaultwarden/server

.", + "description": "Alternative implementation of the Bitwarden password manager server API written in Rust and on Alpine (speed, size).

Based on the following docker image: https://hub.docker.com/r/vaultwarden/server compatible with amd64 and arm64 architectures.

", "version": "0.0.1", "website": "https://github.com/dani-garcia/vaultwarden", "more_info": "SSL/TLS certs and keys required. They must be placed in the Rockstor share used as Vaultwarden cert storage during the rock-on's installation process:
  • /mnt2/[share-name]/certs.pem
  • /mnt2/[share-name]/key.pem

Of note, certs.pem can be a chain. Need a cert? Try mkcert or openssl.", From a927678f505fc1de325624ee540f49d65ef31972 Mon Sep 17 00:00:00 2001 From: Roland Vet Date: Sun, 26 Dec 2021 07:46:13 +0100 Subject: [PATCH 4/4] Remove reference to Alpine Vaultwarden docker images tagged with 'latest' are built on Debian not Alpine. --- vaultwarden.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaultwarden.json b/vaultwarden.json index d4945a5b..ee8a94ac 100644 --- a/vaultwarden.json +++ b/vaultwarden.json @@ -1,6 +1,6 @@ { "Vaultwarden": { - "description": "Alternative implementation of the Bitwarden password manager server API written in Rust and on Alpine (speed, size).

Based on the following docker image: https://hub.docker.com/r/vaultwarden/server compatible with amd64 and arm64 architectures.

", + "description": "Alternative implementation of the Bitwarden password manager server API written in Rust.

Based on the following docker image: https://hub.docker.com/r/vaultwarden/server compatible with amd64 and arm64 architectures.

", "version": "0.0.1", "website": "https://github.com/dani-garcia/vaultwarden", "more_info": "SSL/TLS certs and keys required. They must be placed in the Rockstor share used as Vaultwarden cert storage during the rock-on's installation process:
  • /mnt2/[share-name]/certs.pem
  • /mnt2/[share-name]/key.pem

Of note, certs.pem can be a chain. Need a cert? Try mkcert or openssl.",