Update/040

.github/workflows/build.yml

@@ -0,0 +1,20 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths-ignore: ['*.md']
+    branches: ['master', 'main', 'update/040']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    if: github.event.pull_request.draft == false
+    uses: start9labs/shared-workflows/.github/workflows/build.yml@master
+    # with:
+    #   FREE_DISK_SPACE: true
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }}

.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*.*'
+
+jobs:
+  release:
+    uses: start9labs/shared-workflows/.github/workflows/release.yml@master
+    with:
+      # FREE_DISK_SPACE: true
+      RELEASE_REGISTRY: ${{ vars.RELEASE_REGISTRY }}
+      S3_S9PKS_BASE_URL: ${{ vars.S3_S9PKS_BASE_URL }}
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+    permissions:
+      contents: write

.github/workflows/tagAndRelease.yml

@@ -0,0 +1,29 @@
+name: Tag and Release
+
+# Disabled — uncomment 'on:' block and remove 'on: workflow_dispatch' to enable auto-tagging on merge to master
+on:
+  workflow_dispatch:
+
+# on:
+#   push:
+#     branches: ['master']
+#     paths-ignore: ['*.md']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  tag:
+    uses: start9labs/shared-workflows/.github/workflows/tagAndRelease.yml@master
+    with:
+      REFERENCE_REGISTRY: ${{ vars.REFERENCE_REGISTRY }}
+      # FREE_DISK_SPACE: true
+      RELEASE_REGISTRY: ${{ vars.RELEASE_REGISTRY }}
+      S3_S9PKS_BASE_URL: ${{ vars.S3_S9PKS_BASE_URL }}
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+    permissions:
+      contents: write

.gitignore

@@ -3,4 +3,6 @@
 .DS_Store
 scripts/*.js
 docker-images
-tmp
+node_modules
+javascript/*
+ncc-cache

Dockerfile

@@ -1,11 +1,11 @@
-# cloudflared container version is defined in Makefile
-ARG CLOUDFLARED_IMAGE
+# cloudflared container version is defined in manifest.ts
+ARG CLOUDFLARED_IMAGE=cloudflare/cloudflared:latest
 
 # used to copy cloudflared binary
-FROM $CLOUDFLARED_IMAGE as cloudflared
+FROM $CLOUDFLARED_IMAGE AS cloudflared
 
-# run on debian bookworm slim
-FROM debian:12-slim
+# run on debian troxie slim
+FROM debian:13-slim
 
 ARG PLATFORM
 
@@ -19,7 +19,8 @@ RUN \
       /var/tmp/* \
       /tmp/*
 
-# add local files
-COPY --chmod=0755 ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
-COPY --chmod=0755 ./tmp/yq_linux_${PLATFORM} /usr/local/bin/yq
+# add cloudflared binary
 COPY --chmod=0755 --from=cloudflared /usr/local/bin/cloudflared /usr/local/bin/cloudflared
+
+# add login helper script
+COPY --chmod=0755 scripts/cf-login.sh /usr/local/bin/cf-login.sh

Makefile

@@ -1,80 +1,3 @@
-CLOUDFLARED_IMAGE := cloudflare/cloudflared:2025.10.0
-# sha256 hashes can be found in https://github.com/mikefarah/yq/releases/download/v4.40.7/checksums-bsd
-YQ_VERSION := 4.40.7
-YQ_SHA_AMD64 := 4f13ee9303a49f7e8f61e7d9c87402e07cc920ae8dfaaa8c10d7ea1b8f9f48ed
-YQ_SHA_ARM64 := a84f2c8f105b70cd348c3bf14048aeb1665c2e7314cbe9aaff15479f268b8412
-
-PKG_ID := $(shell yq e ".id" manifest.yaml)
-PKG_VERSION := $(shell yq e ".version" manifest.yaml)
-TS_FILES := $(shell find ./ -name \*.ts)
-
-.DELETE_ON_ERROR:
-
-all: verify
-
-arm:
-	@rm -f docker-images/aarch64.tar
-	@ARCH=aarch64 $(MAKE)
-
-x86:
-	@rm -f docker-images/x86_64.tar
-	@ARCH=x86_64 $(MAKE)
-
-verify: $(PKG_ID).s9pk
-	@start-sdk verify s9pk $(PKG_ID).s9pk
-	@echo " Done!"
-	@echo "   Filesize: $(shell du -h $(PKG_ID).s9pk) is ready"
-
-install:
-	@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
-	rm -f $(PKG_ID).s9pk
-	rm -f scripts/*.js
-
-scripts/embassy.js: $(TS_FILES)
-	deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts
-
-docker-images/aarch64.tar: manifest.yaml Dockerfile docker_entrypoint.sh tmp/yq_linux_arm64
-ifeq ($(ARCH),x86_64)
-else
-	mkdir -p docker-images
-	docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) \
-		--build-arg PLATFORM=arm64 \
-		--build-arg CLOUDFLARED_IMAGE=$(CLOUDFLARED_IMAGE) \
-		--platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar .
-endif
-
-docker-images/x86_64.tar: manifest.yaml Dockerfile docker_entrypoint.sh tmp/yq_linux_amd64
-ifeq ($(ARCH),aarch64)
-else
-	mkdir -p docker-images
-	docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) \
-		--build-arg PLATFORM=amd64 \
-		--build-arg CLOUDFLARED_IMAGE=$(CLOUDFLARED_IMAGE) \
-		--platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
-endif
-
-tmp/yq_linux_amd64: 
-	mkdir -p tmp
-	wget -qO ./tmp/yq_linux_amd64 https://github.com/mikefarah/yq/releases/download/v$(YQ_VERSION)/yq_linux_amd64
-	echo "$(YQ_SHA_AMD64) ./tmp/yq_linux_amd64" | sha256sum --check || exit 1
-
-tmp/yq_linux_arm64: 
-	mkdir -p tmp
-	wget -qO ./tmp/yq_linux_arm64 https://github.com/mikefarah/yq/releases/download/v$(YQ_VERSION)/yq_linux_arm64
-	echo "$(YQ_SHA_ARM64) ./tmp/yq_linux_arm64" | sha256sum --check || exit 1
-
-$(PKG_ID).s9pk: manifest.yaml instructions.md icon.png LICENSE scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar 
-ifeq ($(ARCH),aarch64)
-	@echo "start-sdk: Preparing aarch64 package ..."
-else ifeq ($(ARCH),x86_64)
-	@echo "start-sdk: Preparing x86_64 package ..."
-else
-	@echo "start-sdk: Preparing Universal Package ..."
-endif
-	@start-sdk pack
+# overrides to s9pk.mk must precede the include statement
+ARCHES := x86 arm
+include s9pk.mk