Merge pull request #17 from remcoros/sparrow-2.0.0

update to Sparrow 2.0.0 and use latest 'baseimage-kasmvnc' container

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-36987b11-ls57 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-12c6f55b-ls87 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH
@@ -50,6 +50,8 @@ RUN \
     fonts-noto-core \
     intel-media-va-driver \
     mesa-va-drivers \
+    mesa-vulkan-drivers \
+    x11-apps \
     xserver-xorg-video-amdgpu \
     xserver-xorg-video-ati \
     xserver-xorg-video-intel \
@@ -136,7 +138,7 @@ ENV \
 
 # add local files
 COPY /root /
-COPY --chmod=a+x ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
+COPY --chmod=755 ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
 COPY --chmod=664 icon.png /kclient/public/icon.png
 COPY --chmod=664 icon.png /kclient/public/favicon.ico
 

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-36987b11-ls57 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-12c6f55b-ls87 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH
@@ -50,6 +50,8 @@ RUN \
     fonts-noto-core \
     intel-media-va-driver \
     mesa-va-drivers \
+    mesa-vulkan-drivers \
+    x11-apps \
     xserver-xorg-video-amdgpu \
     xserver-xorg-video-ati \
     xserver-xorg-video-intel \
@@ -136,7 +138,7 @@ ENV \
 
 # add local files
 COPY /root /
-COPY --chmod=a+x ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
+COPY --chmod=755 ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
 COPY --chmod=664 icon.png /kclient/public/icon.png
 COPY --chmod=664 icon.png /kclient/public/favicon.ico
 

Makefile

@@ -1,5 +1,5 @@
-SPARROW_VERSION := 1.9.1
-SPARROW_DEBVERSION := 1.9.1-1
+SPARROW_VERSION := 2.0.0
+SPARROW_DEBVERSION := 2.0.0-1
 SPARROW_PGP_SIG := E94618334C674B40
 # sha256 hashes can be found in https://github.com/mikefarah/yq/releases/download/v4.40.7/checksums-bsd
 YQ_VERSION := 4.40.7
@@ -17,12 +17,10 @@ ASSET_FILES := $(shell find ./assets/compat)
 all: verify
 
 arm:
-	# this is not a typo, when building arm, remove the x86_64 image so it doesn't get packed by start-sdk
 	@rm -f docker-images/x86_64.tar
 	@ARCH=aarch64 $(MAKE)
 
 x86:
-	# this is not a typo, when building x86, remove the aarch64 image so it doesn't get packed by start-sdk
 	@rm -f docker-images/aarch64.tar
 	@ARCH=x86_64 $(MAKE)
 
@@ -32,11 +30,10 @@ verify: $(PKG_ID).s9pk
 	@echo "   Filesize: $(shell du -h $(PKG_ID).s9pk) is ready"
 
 install:
-ifeq (,$(wildcard ~/.embassy/config.yaml))
-	@echo; echo "You must define \"host: http://server-name.local\" in ~/.embassy/config.yaml config file first"; echo
-else
-	start-cli package install $(PKG_ID).s9pk
-endif
+	@if [ ! -f ~/.embassy/config.yaml ]; then echo "You must define \"host: http://server-name.local\" in ~/.embassy/config.yaml config file first."; exit 1; fi
+	@echo "\nInstalling to $$(grep -v '^#' ~/.embassy/config.yaml | cut -d'/' -f3) ...\n"
+	@[ -f $(PKG_ID).s9pk ] || ( $(MAKE) && echo "\nInstalling to $$(grep -v '^#' ~/.embassy/config.yaml | cut -d'/' -f3) ...\n" )
+	@start-cli package install $(PKG_ID).s9pk
 
 clean:
 	rm -rf docker-images

manifest.yaml

@@ -1,8 +1,8 @@
 id: sparrow-webtop
 title: "Sparrow"
-version: 1.9.1
+version: 2.0.0
 release-notes: |
-  * Update to Sparrow 1.9.1 - See [full changelog](https://github.com/sparrowwallet/sparrow/releases/tag/1.9.1)
+  * Update to Sparrow 2.0.0 - See [full changelog](https://github.com/sparrowwallet/sparrow/releases/tag/2.0.0)
 license: GPLv3
 wrapper-repo: "https://github.com/remcoros/sparrow-webtop-startos"
 upstream-repo: "https://github.com/sparrowwallet/sparrow"

scripts/procedures/migrations.ts

@@ -1,4 +1,4 @@
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
-    .fromMapping({}, "1.9.1" );
+    .fromMapping({}, "2.0.0" );