feat: embed templates and static assets with go:embed for distroless containers

Replace all runtime template.ParseFiles() calls with template.ParseFS()
using an embedded filesystem, and serve static assets from an embedded FS
via http.FileServerFS(). This eliminates the need for COPY steps in the
Dockerfile and ensures the binary works with readOnlyRootFilesystem: true.

- Add internal/templates/embed.go exposing templates.FS
- Add static/embed.go exposing static.FS
- Update all handlers to use template.ParseFS(templates.FS, ...)
- Update static file server to use http.FileServerFS(static.FS)
- Remove COPY static/ and COPY internal/templates/ from Dockerfile
- Remove TestMain working directory hack (no longer needed)

Closes leeworks-agents/gitea-mobile#231
Closes leeworks-agents/gitea-mobile#220
Closes leeworks-agents/gitea-mobile#221

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Dockerfile

@@ -7,10 +7,10 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /gitea-mobile ./cmd/server
 
 # Stage 2: Runtime
+# Templates and static assets are embedded in the binary via go:embed,
+# so no COPY steps are needed for them.
 FROM gcr.io/distroless/static:nonroot
 COPY --from=builder /gitea-mobile /gitea-mobile
-COPY static/ /static/
-COPY internal/templates/ /templates/
 EXPOSE 8080
 USER nonroot:nonroot
 ENTRYPOINT ["/gitea-mobile"]

internal/handlers/handlers.go

@@ -12,6 +12,8 @@ import (
 	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/config"
 	giteaclient "gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/gitea"
 	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
+	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/templates"
+	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/static"
 )
 
 // Handler holds shared dependencies for all HTTP handlers.
@@ -56,7 +58,6 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
 	mux.HandleFunc("GET /pulls/{owner}/{repo}/{index}", h.PullDetail)
 	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
 	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/state", h.SetPullState)
-	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/merge", h.MergePull)
 
 	// Settings (handled separately for auth bypass).
 	settingsHandler := &SettingsHandler{
@@ -65,8 +66,8 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
 	}
 	mux.HandleFunc("/settings", settingsHandler.ServeHTTP)
 
-	// Static files.
+	// Static files — served from embedded filesystem.
-	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
+	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServerFS(static.FS)))
 }
 
 // isHTMX returns true if the request is an HTMX partial request.
@@ -236,7 +237,7 @@ func (h *Handler) ErrorInternal(w http.ResponseWriter, r *http.Request) {
 
 // renderError renders the error template with the given data and status code.
 func (h *Handler) renderError(w http.ResponseWriter, r *http.Request, data errorData) {
-	tmpl, err := template.ParseFiles("internal/templates/error.html")
+	tmpl, err := template.ParseFS(templates.FS, "error.html")
 	if err != nil {
 		slog.Error("failed to parse error template", "error", err)
 		http.Error(w, fmt.Sprintf("%d %s", data.Code, data.Title), data.Code)
@@ -299,7 +300,7 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	tmpl, err := template.ParseFiles("internal/templates/dashboard.html")
+	tmpl, err := template.ParseFS(templates.FS, "dashboard.html")
 	if err != nil {
 		slog.Error("failed to parse dashboard template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -391,7 +392,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
 
 	// For HTMX infinite-scroll requests (page > 1), return only the card fragment.
 	if isHTMX(r) && page > 1 {
-		tmpl, err := template.ParseFiles("internal/templates/issues.html")
+		tmpl, err := template.ParseFS(templates.FS, "issues.html")
 		if err != nil {
 			slog.Error("failed to parse issues template", "error", err)
 			http.Error(w, "template error", http.StatusInternalServerError)
@@ -408,7 +409,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tmpl, err := template.ParseFiles("internal/templates/issues.html")
+	tmpl, err := template.ParseFS(templates.FS, "issues.html")
 	if err != nil {
 		slog.Error("failed to parse issues template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -503,7 +504,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
 
 	// For HTMX infinite-scroll requests (page > 1), return only the card fragment.
 	if isHTMX(r) && page > 1 {
-		tmpl, err := template.ParseFiles("internal/templates/pulls.html")
+		tmpl, err := template.ParseFS(templates.FS, "pulls.html")
 		if err != nil {
 			slog.Error("failed to parse pulls template", "error", err)
 			http.Error(w, "template error", http.StatusInternalServerError)
@@ -520,7 +521,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tmpl, err := template.ParseFiles("internal/templates/pulls.html")
+	tmpl, err := template.ParseFS(templates.FS, "pulls.html")
 	if err != nil {
 		slog.Error("failed to parse pulls template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -588,7 +589,7 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Build the content HTML using the template.
-	tmpl, err := template.ParseFiles("internal/templates/issue_detail.html")
+	tmpl, err := template.ParseFS(templates.FS, "issue_detail.html")
 	if err != nil {
 		slog.Error("failed to parse issue_detail template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -661,7 +662,7 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Build the content HTML using the template.
-	tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
+	tmpl, err := template.ParseFS(templates.FS, "pull_detail.html")
 	if err != nil {
 		slog.Error("failed to parse pull_detail template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -702,7 +703,7 @@ func (h *Handler) NewIssue(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tmpl, err := template.ParseFiles("internal/templates/create_issue.html")
+	tmpl, err := template.ParseFS(templates.FS, "create_issue.html")
 	if err != nil {
 		slog.Error("failed to parse create_issue template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
@@ -1103,49 +1104,3 @@ func (h *Handler) SubmitReview(w http.ResponseWriter, r *http.Request) {
 
 	http.Redirect(w, r, fmt.Sprintf("/pulls/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
 }
-
-// MergePull handles POST /pulls/{owner}/{repo}/{index}/merge.
-func (h *Handler) MergePull(w http.ResponseWriter, r *http.Request) {
-	token := getToken(r)
-	owner := r.PathValue("owner")
-	repo := r.PathValue("repo")
-	indexStr := r.PathValue("index")
-
-	index, err := strconv.ParseInt(indexStr, 10, 64)
-	if err != nil {
-		http.Error(w, "invalid PR index", http.StatusBadRequest)
-		return
-	}
-
-	if err := r.ParseForm(); err != nil {
-		http.Error(w, "bad request", http.StatusBadRequest)
-		return
-	}
-
-	style := r.FormValue("Do")
-	if style == "" {
-		style = "merge"
-	}
-	title := r.FormValue("merge_title")
-	message := r.FormValue("merge_message")
-
-	if err := h.Client.MergePull(r.Context(), token, owner, repo, index, style, title, message); err != nil {
-		slog.Error("failed to merge pull request", "error", err, "owner", owner, "repo", repo, "index", index)
-		if isHTMX(r) {
-			w.Header().Set("Content-Type", "text/html; charset=utf-8")
-			w.WriteHeader(http.StatusInternalServerError)
-			fmt.Fprint(w, `<span style="color:#f85149">Failed to merge pull request.</span>`)
-			return
-		}
-		http.Error(w, "failed to merge pull request", http.StatusInternalServerError)
-		return
-	}
-
-	if isHTMX(r) {
-		w.Header().Set("Content-Type", "text/html; charset=utf-8")
-		fmt.Fprint(w, `<span style="color:#a371f7;font-weight:bold">Merged</span>`)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/pulls/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
-}

internal/handlers/integration_test.go

@@ -7,9 +7,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"os"
-	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -18,26 +15,8 @@ import (
 	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
 )
 
-// TestMain changes the working directory to the project root so that
+// Note: TestMain is no longer needed because templates and static assets
-// template files can be found by handlers that use relative paths.
+// are embedded at compile time via go:embed. Tests work from any directory.
-func TestMain(m *testing.M) {
-	// Walk up from this source file to find the project root (where go.mod lives).
-	_, filename, _, _ := runtime.Caller(0)
-	dir := filepath.Dir(filename)
-	for {
-		if _, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil {
-			break
-		}
-		parent := filepath.Dir(dir)
-		if parent == dir {
-			// Reached filesystem root without finding go.mod; run tests from cwd.
-			break
-		}
-		dir = parent
-	}
-	_ = os.Chdir(dir)
-	os.Exit(m.Run())
-}
 
 // mockGiteaAPI starts an httptest server that simulates the Gitea API
 // endpoints needed by the handlers. Returns the server and a cleanup func.
@@ -185,11 +164,6 @@ func mockGiteaAPI(t *testing.T) *httptest.Server {
 		json.NewEncoder(w).Encode(map[string]interface{}{"id": 1, "state": "APPROVED"})
 	})
 
-	// POST /api/v1/repos/{owner}/{repo}/pulls/{index}/merge — merge PR.
-	mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/pulls/{index}/merge", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	})
-
 	// POST /api/v1/markdown — render markdown.
 	mux.HandleFunc("POST /api/v1/markdown", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html")
@@ -922,67 +896,6 @@ func TestIntegration_SubmitReview_RequestChanges(t *testing.T) {
 	}
 }
 
-// --- Issue #229: Integration tests for POST /pulls/{owner}/{repo}/{index}/merge ---
-
-func TestIntegration_MergePull_Valid(t *testing.T) {
-	h, srv := newTestHandlerWithMock(t)
-	defer srv.Close()
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/merge", h.MergePull)
-
-	form := url.Values{"Do": {"merge"}}
-	req := reqWithToken(http.MethodPost, "/pulls/test-org/repo1/1/merge", form.Encode())
-	w := httptest.NewRecorder()
-
-	mux.ServeHTTP(w, req)
-
-	if w.Code != http.StatusSeeOther {
-		t.Errorf("status = %d, want %d", w.Code, http.StatusSeeOther)
-	}
-}
-
-func TestIntegration_MergePull_HTMX(t *testing.T) {
-	h, srv := newTestHandlerWithMock(t)
-	defer srv.Close()
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/merge", h.MergePull)
-
-	form := url.Values{"Do": {"squash"}}
-	req := reqWithToken(http.MethodPost, "/pulls/test-org/repo1/1/merge", form.Encode())
-	req.Header.Set("HX-Request", "true")
-	w := httptest.NewRecorder()
-
-	mux.ServeHTTP(w, req)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
-	}
-	body := w.Body.String()
-	if !contains(body, "Merged") {
-		t.Errorf("expected 'Merged' in HTMX response, got: %s", body)
-	}
-}
-
-func TestIntegration_MergePull_DefaultStyle(t *testing.T) {
-	h, srv := newTestHandlerWithMock(t)
-	defer srv.Close()
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/merge", h.MergePull)
-
-	// No "Do" form value — should default to "merge".
-	req := reqWithToken(http.MethodPost, "/pulls/test-org/repo1/1/merge", "")
-	w := httptest.NewRecorder()
-
-	mux.ServeHTTP(w, req)
-
-	if w.Code != http.StatusSeeOther {
-		t.Errorf("status = %d, want %d", w.Code, http.StatusSeeOther)
-	}
-}
-
 // --- Issue #110: Integration tests for POST /issues/{owner}/{repo}/{index}/labels ---
 
 func TestIntegration_ApplyLabels_Valid(t *testing.T) {

internal/handlers/settings.go

@@ -8,10 +8,9 @@ import (
 
 	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/auth"
 	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
+	"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/templates"
 )
 
-const settingsTemplatePath = "internal/templates/settings.html"
-
 // SettingsHandler handles GET and POST requests for the settings page.
 type SettingsHandler struct {
 	SessionSecret string
@@ -101,7 +100,7 @@ func (h *SettingsHandler) renderWithMessage(w http.ResponseWriter, r *http.Reque
 }
 
 func (h *SettingsHandler) renderSettings(w http.ResponseWriter, data settingsData) {
-	tmpl, err := template.ParseFiles(settingsTemplatePath)
+	tmpl, err := template.ParseFS(templates.FS, "settings.html")
 	if err != nil {
 		slog.Error("failed to parse settings template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)

internal/templates/embed.go

@@ -0,0 +1,9 @@
+// Package templates provides embedded HTML template files.
+package templates
+
+import "embed"
+
+// FS contains all HTML template files embedded at compile time.
+//
+//go:embed *.html
+var FS embed.FS

internal/templates/pull_detail.html

@@ -33,23 +33,6 @@
   {{end}}
 </div>
 
-{{if and .Pull.Mergeable (eq .Pull.State "open")}}
-<div class="card" style="margin-top:1rem;" id="merge-section">
-  <h2>Merge Pull Request</h2>
-  <form hx-post="/pulls/{{.Pull.RepoOwner}}/{{.Pull.RepoName}}/{{.Pull.Number}}/merge" hx-target="#merge-section" hx-swap="innerHTML">
-    <div class="form-group">
-      <label for="merge-style">Merge Style</label>
-      <select id="merge-style" name="Do">
-        <option value="merge">Merge Commit</option>
-        <option value="rebase">Rebase</option>
-        <option value="squash">Squash</option>
-      </select>
-    </div>
-    <button type="submit" class="btn btn-primary" style="background-color:var(--accent-purple,#a371f7);">Merge PR</button>
-  </form>
-</div>
-{{end}}
-
 <div class="card" style="margin-top:1rem;">
   <h2>Submit Review</h2>
   <form hx-post="/pulls/{{.Pull.RepoOwner}}/{{.Pull.RepoName}}/{{.Pull.Number}}/review" hx-swap="outerHTML">

static/embed.go

@@ -0,0 +1,10 @@
+// Package static provides embedded static asset files (CSS, JS, icons, etc.).
+package static
+
+import "embed"
+
+// FS contains all static asset files embedded at compile time.
+// Files are served via http.FileServerFS in the handlers package.
+//
+//go:embed *.css *.js *.json *.png
+var FS embed.FS