Docker builds

Author: zefhemel

.github/workflows/docker.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "go-backend"
     tags:
       - "*"
 env:
@@ -62,7 +63,7 @@ jobs:
             # When pushing to main branch, release as :edge DISABLED FOR NOW
             # type=edge,branch=main
             # When pushing to main branch, release as :v2
-            type=raw,value=v2,enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=v2-go,enable=${{ github.ref == 'refs/heads/go-backend' }}
 
       - name: Build and push main docker images
         uses: docker/[email protected]

Dockerfile

@@ -1,12 +1,22 @@
-
 # Stage 1: Build the silverbullet binary
 FROM denoland/deno:2.5.0 AS builder
-RUN apt update && apt install -y git
+RUN apt update && apt install -y git wget
+
+ARG TARGETARCH
+ENV GO_VERSION=1.25.1
+
+RUN wget -P /tmp "https://dl.google.com/go/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz"
+RUN tar -C /usr/local -xzf "/tmp/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz"
+
+ENV GOPATH=/go
+ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
+
 WORKDIR /app
 ADD . /app
 
 # This will produce the `silverbullet` self-contained binary in /app/silverbullet
 RUN deno task build
+RUN go build
 
 # Stage 2: Create the runtime from the build
 FROM ubuntu:noble

deno.json

@@ -2,7 +2,7 @@
   "name": "@silverbulletmd/silverbullet",
   "version": "2.0.0",
   "tasks": {
-    "build": "rm -rf dist dist_client_bundle dist_plug_bundle && deno run -A build_plugs.ts && deno run -A build_web.ts --production && deno task compile",
+    "build": "rm -rf dist dist_client_bundle dist_plug_bundle && deno run -A build_plugs.ts && deno run -A build_web.ts --production",
     "clean": "rm -rf dist dist_client_bundle dist_plug_bundle",
     "deep-clean-mac": "rm -f deno.lock && rm -rf $HOME/Library/Caches/deno && deno task clean",
     "install": "deno install -g -f -A --import-map deno.json silverbullet.ts",

pkg/server/cmd/server.go

@@ -39,9 +39,10 @@ func buildConfig(bundledFiles fs.FS, args []string) *server.ServerConfig {
 	if len(args) > 0 {
 		serverConfig.SpaceFolderPath = args[0]
 	}
-	if os.Getenv("SB_FOLDER_PATH") != "" {
-		serverConfig.SpaceFolderPath = os.Getenv("SB_FOLDER_PATH")
+	if os.Getenv("SB_FOLDER") != "" {
+		serverConfig.SpaceFolderPath = os.Getenv("SB_FOLDER")
 	}
+
 	if serverConfig.SpaceFolderPath == "" {
 		log.Fatal("No folder specified. Please pass a folder as an argument or set SB_FOLDER environment variable.")
 	}
@@ -144,7 +145,6 @@ func ServerCommand(bundledFiles fs.FS) *cobra.Command {
 	var c = &cobra.Command{
 		Use:   "silverbullet [path]",
 		Short: "Run the Silverbullet server",
-		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			serverConfig := buildConfig(bundledFiles, args)
 			if err := server.RunServer(serverConfig); err != nil {