Skip to content

Commit

Permalink
refactor instructions and hard code licesne
Browse files Browse the repository at this point in the history
  • Loading branch information
MattDHill committed Jan 11, 2023
1 parent 30656fc commit b926b27
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 138 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
image.tar
vaultwarden.s9pk
instructions.md
scripts/*.js
scripts/generated/manifest.ts
.vscode/
docker-images
LICENSE
docker-images
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
DOC_ASSETS := $(shell find ./docs/assets)
PKG_VERSION := $(shell cat manifest.json | jq -r '.version')
UPSTREAM_VERSION :=$(shell ./utils/get_upstream_version.sh ${PKG_VERSION})
PKG_ID := $(shell cat manifest.json | jq -r '.id')
TS_FILES := $(shell find ./ -name \*.ts)

Expand All @@ -25,9 +24,6 @@ $(PKG_ID).s9pk: manifest.json LICENSE instructions.md icon.png scripts/embassy.j
if ! [ -z "$(ARCH)" ]; then cp docker-images/$(ARCH).tar image.tar; fi
embassy-sdk pack

instructions.md: docs/instructions.md $(DOC_ASSETS)
cd docs && md-packer < instructions.md > ../instructions.md

docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh manifest.json
mkdir -p docker-images
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --build-arg DB=sqlite --build-arg PLATFORM=arm64 --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/arm64/v8 -o type=docker,dest=docker-images/aarch64.tar -f Dockerfile .
Expand All @@ -41,7 +37,4 @@ scripts/embassy.js: $(TS_FILES) scripts/generated/manifest.ts

scripts/generated/manifest.ts: manifest.json
mkdir -p scripts/generated
deno run --allow-write scripts/generators/generateManifest.ts

LICENSE:
wget https://raw.githubusercontent.com/dani-garcia/vaultwarden/$(UPSTREAM_VERSION)/LICENSE.txt -O - > LICENSE
deno run --allow-write scripts/generators/generateManifest.ts
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Install the system dependencies below to build this project by following the ins
- [docker-buildx](https://docs.docker.com/buildx/working-with-buildx/)
- [jq](https://stedolan.github.io/jq/)
- [embassy-sdk](https://github.com/Start9Labs/embassy-os/blob/master/backend/install-sdk.sh)
- [md-packer](https://github.com/Start9Labs/md-packer)
- [deno](https://deno.land/#installation)
- [make](https://www.gnu.org/software/make/)
- [wget](https://command-not-found.com/wget)
Expand Down
Binary file removed docs/assets/img-1.png
Binary file not shown.
Binary file removed docs/assets/img-2.png
Binary file not shown.
Binary file removed docs/assets/img-3.png
Binary file not shown.
Binary file removed docs/assets/img-4.png
Binary file not shown.
Binary file removed docs/assets/img-5.png
Binary file not shown.
114 changes: 0 additions & 114 deletions docs/guides.md

This file was deleted.

File renamed without changes.
12 changes: 0 additions & 12 deletions utils/get_upstream_version.sh

This file was deleted.

0 comments on commit b926b27

Please sign in to comment.