diff --git a/Makefile b/Makefile index 01a19bf..89313c8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ DOC_ASSETS := $(shell find ./docs/assets) EMVER := $(shell cat manifest.json | jq -r '.version') PKG_ID := $(shell cat manifest.json | jq -r '.id') -ASSET_PATHS := $(shell find ./assets/*) VERSION := $(shell git --git-dir=vaultwarden/.git describe --tags) VAULTWARDEN_SRC := $(shell find vaultwarden/src) vaultwarden/Cargo.toml vaultwarden/Cargo.lock VAULTWARDEN_GIT_REF := $(shell cat .git/modules/vaultwarden/HEAD) @@ -20,7 +19,7 @@ verify: vaultwarden.s9pk $(S9PK_PATH) install: vaultwarden.s9pk embassy-cli package install vaultwarden.s9pk -vaultwarden.s9pk: manifest.json LICENSE image.tar instructions.md icon.png $(ASSET_PATHS) scripts/embassy.js +vaultwarden.s9pk: manifest.json LICENSE image.tar instructions.md icon.png scripts/embassy.js embassy-sdk pack instructions.md: docs/instructions.md $(DOC_ASSETS) diff --git a/assets/compat/config_rules.yaml b/assets/compat/config_rules.yaml deleted file mode 100644 index 0637a08..0000000 --- a/assets/compat/config_rules.yaml +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/assets/compat/config_spec.yaml b/assets/compat/config_spec.yaml deleted file mode 100644 index 2253958..0000000 --- a/assets/compat/config_spec.yaml +++ /dev/null @@ -1,12 +0,0 @@ -admin-token: - type: string - name: Admin Token - description: Authentication token for logging into your admin dashboard. - nullable: false - pattern: '[a-zA-Z0-9/=\-_]+' - pattern-description: 'Must be a valid base 64 string' - copyable: true - masked: true - default: - charset: 'a-z,A-Z,0-9,/,=' - len: 64 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 46de225..5c7415b 100644 --- a/manifest.json +++ b/manifest.json @@ -28,8 +28,7 @@ "entrypoint": "/usr/local/bin/docker_entrypoint.sh", "args": [], "mounts": { - "main": "/data", - "compat": "/mnt/assets" + "main": "/data" }, "io-format": "yaml" }, @@ -55,9 +54,6 @@ "volumes": { "main": { "type": "data" - }, - "compat": { - "type": "assets" } }, "alerts": {}, diff --git a/vaultwarden.old.s9pk b/vaultwarden.old.s9pk new file mode 100644 index 0000000..863545d Binary files /dev/null and b/vaultwarden.old.s9pk differ