merge

Makefile

@@ -1,4 +1,5 @@
 ASSETS := $(shell yq r manifest.yaml assets.*.src)
+DOC_ASSETS := $(shell find ./docs/assets)
 ASSET_PATHS := $(addprefix assets/,$(ASSETS))
 VERSION := $(shell git --git-dir=bitwarden_rs/.git describe --tags)
 BITWARDEN_SRC := $(shell find bitwarden_rs/src) bitwarden_rs/Cargo.toml bitwarden_rs/Cargo.lock
@@ -16,6 +17,9 @@ bitwarden.s9pk: manifest.yaml config_spec.yaml config_rules.yaml image.tar instr
 	appmgr -vv pack $(shell pwd) -o bitwarden.s9pk
 	appmgr -vv verify bitwarden.s9pk
 
+instructions.md: docs/instructions.md $(DOC_ASSETS)
+	cd docs && md-packer < instructions.md > ../instructions.md
+
 image.tar: Dockerfile $(BITWARDEN_SRC)
 	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --tag start9/bitwarden --platform=linux/arm/v7 -o type=docker,dest=image.tar -f Dockerfile ./bitwarden_rs
 

README.md

@@ -6,6 +6,7 @@
 - [docker-buildx](https://docs.docker.com/buildx/working-with-buildx/)
 - [yq](https://mikefarah.gitbook.io/yq)
 - [appmgr](https://github.com/Start9Labs/appmgr)
+- [md-packer](https://github.com/Start9Labs/md-packer)
 
 ## Cloning
 ```

docs/instructions.md

@@ -4,26 +4,36 @@
 
 1. Open the browser and visit the add-ons section.
 
+<!-- MD_PACKER_INLINE BEGIN -->
 ![](./assets/img-1.png)
+<!-- MD_PACKER_INLINE END -->
 
 3. Search for “Bitwarden” and click “Add to Firefox”.
 
+<!-- MD_PACKER_INLINE BEGIN -->
 ![](./assets/img-2.png)
+<!-- MD_PACKER_INLINE END -->
 
 4. Access the Bitwarden settings.
 
+<!-- MD_PACKER_INLINE BEGIN -->
 ![](./assets/img-3.png)
+<!-- MD_PACKER_INLINE END -->
 
 5. Copy your Bitwarden Tor Address from your Companion App and paste it into the “Self Hosted Environment” → “Server URL” field. Add “http://” (*not* https://) to the frontend of the onion URL. Then click “Save”.
 
+<!-- MD_PACKER_INLINE BEGIN -->
 ![](./assets/img-4.png)
+<!-- MD_PACKER_INLINE END -->
 
 6. Click “Create Account” and fill in the required fields.
 
 This *does not* mean you are creating an account with Bitwarden or any other third party. You are creating an account with yourself on your own Embassy. It’s awesome!
 
+<!-- MD_PACKER_INLINE BEGIN -->
 ![](./assets/img-5.png)
+<!-- MD_PACKER_INLINE END -->
 
 ## Keep in Mind
 
-Bitwarden on the Embassy is a *self-hosted* password manager, which means your passwords physically live on your Embassy. Be sure to create backups and keep them safe. If you lose your Embassy or uninstall Bitwarden, and you have not made a backup, all your passwords will be gone forever.
+Bitwarden on the Embassy is a *self-hosted* password manager, which means your passwords physically live on your Embassy. Be sure to create backups and keep them safe. If you lose your Embassy or uninstall Bitwarden, and you have not made a backup, all your passwords will be lost forever.