Update/040

.github/workflows/buildService.yml

@@ -4,34 +4,20 @@ on:
   workflow_dispatch:
   pull_request:
     paths-ignore: ['*.md']
-    branches: ['main', 'master']
+    branches: ['master']
   push:
     paths-ignore: ['*.md']
-    branches: ['main', 'master']
+    branches: ['master']
 
-jobs:
-  BuildPackage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prepare StartOS SDK
-        uses: Start9Labs/sdk@v1
-
-      - name: Checkout services repository
-        uses: actions/checkout@v4
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
-      - name: Build the service package
-        id: build
-        run: |
-          git submodule update --init --recursive
-          start-sdk init
-          make
-          PACKAGE_ID=$(yq -oy ".id" manifest.*)
-          echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
-          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
-        shell: bash
-
-      - name: Upload .s9pk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.package_id }}.s9pk
-          path: ./${{ env.package_id }}.s9pk
+jobs:
+  build:
+    if: github.event.pull_request.draft == false
+    uses: start9labs/shared-workflows/.github/workflows/buildService.yml@master
+    # with:
+    #   FREE_DISK_SPACE: true
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }}

.github/workflows/releaseService.yml

@@ -6,67 +6,15 @@ on:
       - 'v*.*'
 
 jobs:
-  ReleasePackage:
-    runs-on: ubuntu-latest
+  release:
+    uses: start9labs/shared-workflows/.github/workflows/releaseService.yml@master
+    with:
+      # FREE_DISK_SPACE: true
+      REGISTRY: ${{ vars.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
-    steps:
-      - name: Prepare StartOS SDK
-        uses: Start9Labs/sdk@v1
-
-      - name: Checkout services repository
-        uses: actions/checkout@v4
-
-      - name: Build the service package
-        run: |
-          git submodule update --init --recursive
-          start-sdk init
-          make
-
-      - name: Setting package ID and title from the manifest
-        id: package
-        run: |
-          echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV
-          echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Generate sha256 checksum
-        run: |
-          PACKAGE_ID=${{ env.package_id }}
-          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
-          sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
-        shell: bash
-
-      - name: Generate changelog
-        run: |
-          PACKAGE_ID=${{ env.package_id }}
-          echo "## What's Changed" > change-log.txt
-          yq -oy '.release-notes' manifest.* >> change-log.txt
-          echo "## SHA256 Hash" >> change-log.txt
-          echo '```' >> change-log.txt
-          sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt
-          echo '```' >> change-log.txt
-        shell: bash
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ github.ref_name }}
-          name: ${{ env.package_title }} ${{ github.ref_name }}
-          prerelease: true
-          body_path: change-log.txt
-          files: |
-            ./${{ env.package_id }}.s9pk
-            ./${{ env.package_id }}.s9pk.sha256
-
-      - name: Publish to Registry
-        env:
-          S9USER: ${{ secrets.S9USER }}
-          S9PASS: ${{ secrets.S9PASS }}
-          S9REGISTRY: ${{ secrets.S9REGISTRY }}
-        run: |
-          if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
-            echo "Publish skipped: missing registry credentials."
-          else
-            start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk
-          fi

.gitignore

@@ -1,9 +1,9 @@
-.DS_Store
-www/.DS_Store
 *.s9pk
-image.tar
-test_config.yaml
-.vscode
-scripts/embassy.js
+startos/*.js
+node_modules/
+.DS_Store
+.vscode/
 docker-images
-TODO.md
+javascript
+ncc-cache
+notes.md

CLAUDE.md

@@ -0,0 +1,4 @@
+## How the upstream version is pulled
+- Image is `dockerBuild` from root (no dockerTag to update)
+
+> This is a Start9-maintained package. Source is in this repo.

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing
+
+## Building and Development
+
+See the [StartOS Packaging Guide](https://docs.start9.com/packaging/) for complete environment setup and build instructions.
+
+### Quick Start
+
+```bash
+# Install dependencies
+npm ci
+
+# Build universal package
+make
+```

Dockerfile

@@ -1,17 +1,7 @@
-FROM alpine:latest
+FROM fholzer/nginx-brotli
 
-RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories
-RUN apk update
-RUN apk add bash curl nginx tini yq
-
-ADD www /var/www
-RUN cp /var/www/assets/main.css /var/www/index/main.css
-RUN cp /var/www/assets/main.css /var/www/welcome/main.css
-ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
-RUN chmod a+x /usr/local/bin/docker_entrypoint.sh
-
-WORKDIR /root
-
-EXPOSE 80
-
-ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]
+RUN \
+  addgroup -g 33 nextcloud-data && \
+  addgroup -g 1000 filebrowser-data && \
+  adduser nginx nextcloud-data && \
+  adduser nginx filebrowser-data

Makefile

@@ -1,34 +1,3 @@
-PKG_ID := $(shell yq e ".id" manifest.toml)
-PKG_VERSION := $(shell yq e ".version" manifest.toml)
-TS_FILES := $(shell find ./scripts -name '*.ts')
-
-.DELETE_ON_ERROR:
-
-all: verify
-
-verify: $(PKG_ID).s9pk
-	start-sdk verify s9pk $(PKG_ID).s9pk
-
-clean:
-	rm -rf docker-images
-	rm -f image.tar
-	rm -f $(PKG_ID).s9pk
-	rm -f scripts/*.js
-
-# assumes /etc/embassy/config.yaml exists on local system with `host: "http://embassy-server-name.local"` configured
-install: $(PKG_ID).s9pk
-	start-cli package install $(PKG_ID).s9pk
-
-$(PKG_ID).s9pk: manifest.toml instructions.md LICENSE icon.png scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar
-	start-sdk pack
-
-docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh
-	mkdir -p docker-images
-	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar .
-
-docker-images/x86_64.tar: Dockerfile docker_entrypoint.sh
-	mkdir -p docker-images
-	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
-
-scripts/embassy.js: $(SCRIPTS_SRC)
-	deno bundle scripts/embassy.ts scripts/embassy.js
+ARCHES := x86 arm
+# overrides to s9pk.mk must precede the include statement
+include s9pk.mk