Update/1.30.x (#46)

* Update version

* Update Makefile to use arm and x86 targets

* Define domain in .env

* Manifest update

* release-notes fix

* No more wrapping ;)

Dockerfile

@@ -1,4 +1,4 @@
-FROM vaultwarden/server:1.29.2
+FROM vaultwarden/server:1.30.0
 
 RUN apt update && \
     apt install -y \

Makefile

@@ -24,6 +24,14 @@ clean:
 	rm -f scripts/generated/manifest.ts
 	rm -f scripts/*.js
 
+arm:
+	@rm -f docker-images/x86_64.tar
+	@ARCH=aarch64 $(MAKE)
+
+x86:
+	@rm -f docker-images/aarch64.tar
+	@ARCH=x86_64 $(MAKE)
+
 $(PKG_ID).s9pk: manifest.json LICENSE instructions.md icon.png scripts/embassy.js  docker-images/x86_64.tar docker-images/aarch64.tar
 ifeq ($(ARCH),aarch64)
 	@echo "start-sdk: Preparing aarch64 package ..."

README.md

@@ -4,7 +4,7 @@
 
 # Vaultwarden for StartOS
 
-[Vaultwarden](https://github.com/dani-garcia/vaultwarden) is a lightweight and secure password manager for storing and auto-filling sensitive information such as usernames and passwords, credit cards, identities, and notes. It is an alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients. This repository creates the `s9pk` package that is installed to run `vaultwarden` on [StarOS](https://github.com/Start9Labs/start-os/).
+[Vaultwarden](https://github.com/dani-garcia/vaultwarden) is a lightweight and secure password manager for storing and auto-filling sensitive information such as usernames and passwords, credit cards, identities, and notes. It is an alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients. This repository creates the `s9pk` package that is installed to run `Vaultwarden` on [StarOS](https://github.com/Start9Labs/start-os/).
 
 ## Dependencies
 

docker_entrypoint.sh

@@ -5,13 +5,14 @@ echo "ADMIN_TOKEN='${VW_ADMIN_TOKEN}'" >> /.env
 #Ensure config.json's admin token gets upgraded if the old token exists in config.json:
 sed -i "s|$ADMIN_TOKEN|$VW_ADMIN_TOKEN|g" /data/config.json
 
+TOR_ADDRESS=$(yq e .vaultwarden-tor-address /data/start9/config.yaml)
+LAN_ADDRESS=$(yq e .vaultwarden-lan-address /data/start9/config.yaml)
+
 cat << EOF >> /.env
 PASSWORD_ITERATIONS=2000000
+DOMAIN="https://$TOR_ADDRESS"
 EOF
 
-TOR_ADDRESS=$(yq e .vaultwarden-tor-address /data/start9/config.yaml)
-LAN_ADDRESS=$(yq e .vaultwarden-lan-address /data/start9/config.yaml)
-
 cat << EOF > /data/start9/stats.yaml
 version: 2
 data:

manifest.json

@@ -1,10 +1,10 @@
 {
   "id": "vaultwarden",
   "title": "Vaultwarden",
-  "version": "1.29.2",
-  "release-notes": "* Upgrade upstream image base to bookworm\n* Latest Web vault update\n* Standardized and optimized icon",
+  "version": "1.30.0",
+  "release-notes": "* Added passkey support\n* Latest Web vault update\n* Full list of upstream changes available [here](https://github.com/dani-garcia/vaultwarden/compare/1.29.2...1.30.0)",
   "license": "AGPLv3",
-  "wrapper-repo": "https://github.com/Start9Labs/vaultwarden-wrapper",
+  "wrapper-repo": "https://github.com/Start9Labs/vaultwarden-startos",
   "upstream-repo": "https://github.com/dani-garcia/vaultwarden",
   "support-site": "https://vaultwarden.discourse.group/",
   "marketing-site": "https://github.com/dani-garcia/vaultwarden/",

scripts/procedures/migrations.ts

@@ -3,7 +3,6 @@ import { manifest } from "../generated/manifest.ts";
 
 export const migration: T.ExpectedExports.migration = migrations.fromMapping(
   {
-    // 1.22.2 No migration needed
     // 1.30.0 No migration needed
   },
   manifest.version,