Start9Labs · MattDHill · Apr 21, 2023 · Apr 24, 2023 · Apr 25, 2023 · Apr 25, 2023
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
-hello-world.s9pk
-image.tar
-scripts/*.js
+*.s9pk
+startos/*.js
+node_modules/
 .DS_Store
 .vscode/
-docker-images
+docker-images
+javascript
diff --git a/.gitmodules b/.gitmodules
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -1,75 +1,35 @@
-PKG_ID := $(shell yq e ".id" manifest.yaml)
-PKG_VERSION := $(shell yq e ".version" manifest.yaml)
-TS_FILES := $(shell find ./ -name \*.ts)
-HELLO_WORLD_SRC := $(shell find ./hello-world/src) hello-world/Cargo.toml hello-world/Cargo.lock
+PACKAGE_ID := $(shell grep -o "id: '[^']*'" startos/manifest.ts | sed "s/id: '\([^']*\)'/\1/")
 
-# delete the target of a rule if it has changed and its recipe exits with a nonzero exit status
-.DELETE_ON_ERROR:
+# Phony targets
+.PHONY: all clean install
 
-all: verify
-
-verify: $(PKG_ID).s9pk
-	@embassy-sdk verify s9pk $(PKG_ID).s9pk
+# Default target
+all: ${PACKAGE_ID}.s9pk
 	@echo " Done!"
-	@echo "   Filesize: $(shell du -h $(PKG_ID).s9pk) is ready"
-
-install:
-ifeq (,$(wildcard ~/.embassy/config.yaml))
-	@echo; echo "You must define \"host: http://embassy-server-name.local\" in ~/.embassy/config.yaml config file first"; echo
-else
-	embassy-cli package install $(PKG_ID).s9pk
-endif
-
-clean:
-	rm -rf docker-images
-	rm -f image.tar
-	rm -f $(PKG_ID).s9pk
-	rm -f scripts/*.js
+	@echo "   Filesize: $(shell du -h $(PACKAGE_ID).s9pk) is ready"
 
-clean-manifest:
-	@sed -i '' '/^[[:blank:]]*#/d;s/#.*//' manifest.yaml
-	@echo; echo "Comments successfully removed from manifest.yaml file."; echo
+# Build targets
+${PACKAGE_ID}.s9pk: $(shell start-cli s9pk list-ingredients)
+	start-cli s9pk pack
 
-# BEGIN REBRANDING
-rebranding:
-	@read -p "Enter new package ID name (must be a single word): " NEW_PKG_ID; \
-	read -p "Enter new package title: " NEW_PKG_TITLE; \
-	find . \( -name "*.md" -o -name ".gitignore" -o -name "manifest.yaml" -o -name "*Service.yml" \) -type f -not -path "./hello-world/*" -exec sed -i '' -e "s/hello-world/$$NEW_PKG_ID/g; s/Hello World/$$NEW_PKG_TITLE/g" {} +; \
-	echo; echo "Rebranding complete."; echo "	New package ID name is:	$$NEW_PKG_ID"; \
-	echo "	New package title is:	$$NEW_PKG_TITLE"; \
-	sed -i '' -e '/^# BEGIN REBRANDING/,/^# END REBRANDING/ s/^#*/#/' Makefile
-	@echo; echo "Note: Rebranding code has been commented out in Makefile"; echo
-# END REBRANDING
+javascript/index.js: $(shell git ls-files startos) tsconfig.json node_modules package.json
+	npm run build
 
-scripts/embassy.js: $(TS_FILES)
-	deno bundle scripts/embassy.ts scripts/embassy.js
+node_modules: package.json package-lock.json
+	npm ci
 
-docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh hello-world/target/aarch64-unknown-linux-musl/release/hello-world
-ifeq ($(ARCH),x86_64)
-else
-	mkdir -p docker-images
-	docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg ARCH=aarch64 --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar .
-endif
+package-lock.json: package.json
+	npm i
 
-docker-images/x86_64.tar: Dockerfile docker_entrypoint.sh hello-world/target/x86_64-unknown-linux-musl/release/hello-world
-ifeq ($(ARCH),aarch64)
-else
-	mkdir -p docker-images
-	docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg ARCH=x86_64 --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
-endif
-
-$(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 "embassy-sdk: Preparing aarch64 package ..."
-else ifeq ($(ARCH),x86_64)
-	@echo "embassy-sdk: Preparing x86_64 package ..."
-else
-	@echo "embassy-sdk: Preparing Universal Package ..."
-endif
-	@embassy-sdk pack
-
-hello-world/target/aarch64-unknown-linux-musl/release/hello-world: $(HELLO_WORLD_SRC)
-	docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/hello-world:/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release
+# Clean target
+clean:
+	rm -rf ${PACKAGE_ID}.s9pk
+	rm -rf javascript
+	rm -rf node_modules
 
-hello-world/target/x86_64-unknown-linux-musl/release/hello-world: $(HELLO_WORLD_SRC)
-	docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/hello-world:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo build --release
+# Install target
+install:
+	@if [ ! -f ~/.startos/config.yaml ]; then echo "You must define \"host: http://server-name.local\" in ~/.startos/config.yaml config file first."; exit 1; fi
+	@echo "\nInstalling to $$(grep -v '^#' ~/.startos/config.yaml | cut -d'/' -f3) ...\n"
+	@[ -f $(PACKAGE_ID).s9pk ] || ( $(MAKE) && echo "\nInstalling to $$(grep -v '^#' ~/.startos/config.yaml | cut -d'/' -f3) ...\n" )
+	@start-cli package install -s $(PACKAGE_ID).s9pk
diff --git a/README.md b/README.md
@@ -1,113 +1,11 @@
-# Wrapper for hello-world
+# Hello World for StartOS
 
-Hello World is a simple, minimal project that serves as a template for creating a service that runs on embassyOS. This repository creates the `s9pk` package that is installed to run `hello-world` on [embassyOS](https://github.com/Start9Labs/embassy-os/). Learn more about service packaging in the [Developer Docs](https://start9.com/latest/developer-docs/).
+A bare bones project serving as a template for [StartOS Service Packaging](https://docs.star9.com/packaging-guide).
 
-## Dependencies
+## Building from source
 
-Install the system dependencies below to build this project by following the instructions in the provided links. You can also find detailed steps to setup your environment in the service packaging [documentation](https://github.com/Start9Labs/service-pipeline#development-environment).
+`make`
 
-- [docker](https://docs.docker.com/get-docker)
-- [docker-buildx](https://docs.docker.com/buildx/working-with-buildx/)
-- [yq](https://mikefarah.gitbook.io/yq)
-- [deno](https://deno.land/)
-- [make](https://www.gnu.org/software/make/)
-- [embassy-sdk](https://github.com/Start9Labs/embassy-os/tree/master/backend)
+## Creating your own project
 
-## Build environment
-Prepare your embassyOS build environment. In this example we are using Ubuntu 20.04.
-1. Install docker
-```
-curl -fsSL https://get.docker.com | bash
-sudo usermod -aG docker "$USER"
-exec sudo su -l $USER
-```
-2. Set buildx as the default builder
-```
-docker buildx install
-docker buildx create --use
-```
-3. Enable cross-arch emulated builds in docker
-```
-docker run --privileged --rm linuxkit/binfmt:v0.8
-```
-4. Install yq
-```
-sudo snap install yq
-```
-5. Install deno
-```
-sudo snap install deno
-```
-6. Install essentials build packages
-```
-sudo apt-get install -y build-essential openssl libssl-dev libc6-dev clang libclang-dev ca-certificates
-```
-7. Install Rust
-```
-curl https://sh.rustup.rs -sSf | sh
-# Choose nr 1 (default install)
-source $HOME/.cargo/env
-```
-8. Build and install embassy-sdk
-```
-cd ~/ && git clone --recursive https://github.com/Start9Labs/embassy-os.git
-cd embassy-os/backend/
-./install-sdk.sh
-embassy-sdk init
-```
-Now you are ready to build the `hello-world` package!
-
-## Cloning
-
-Clone the project locally:
-
-```
-git clone https://github.com/Start9Labs/hello-world-wrapper.git
-cd hello-world-wrapper
-git submodule update --init --recursive
-```
-
-## Building
-
-To build the `hello-world` package for all platforms using embassy-sdk version >=0.3.3, run the following command:
-
-```
-make
-```
-
-To build the `hello-world` package for a single platform using embassy-sdk version <=0.3.2, run:
-
-```
-# for amd64
-make ARCH=x86_64
-```
-or
-```
-# for arm64
-make ARCH=aarch64
-```
-
-## Installing (on embassyOS)
-
-Run the following commands to determine successful install:
-> :information_source: Change embassy-server-name.local to your Embassy address
-
-```
-embassy-cli auth login
-# Enter your embassy password
-embassy-cli --host https://embassy-server-name.local package install hello-world.s9pk
-```
-
-If you already have your `embassy-cli` config file setup with a default `host`, you can install simply by running:
-
-```
-make install
-```
-
-> **Tip:** You can also install the hello-world.s9pk using **Sideload Service** under the **System > Manage** section.
-
-### Verify Install
-
-Go to your Embassy Services page, select **Hello World**, configure and start the service. Then, verify its interfaces are accessible.
-
-**Done!** 
+Follow the [Quick Start Guide](https://docs.star9.com/packaging-guide/quick-start/) for StartOS service packaging, replacing references to `hello-world-startos` with this service ID.
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
diff --git a/hello-world b/hello-world
diff --git a/instructions.md b/instructions.md
@@ -1,5 +1,7 @@
-# Instructions for Hello World
+# Hello World for StartOS
 
-Instructions go here. These appear to the user in the UI on the Service page under **Instructions**.
+A bare bones project serving as a template for [StartOS Service Packaging](https://docs.star9.com/packaging-guide).
 
-You are allowed to include basic [Markdown formatting](https://www.markdownguide.org/basic-syntax).
+## Building from source
+
+Follow the [Quick Start Guide](https://docs.star9.com/packaging-guide/quick-start/) for StartOS service packaging, replacing references to `hello-world-startos` with this service ID.