Update dependency vite to v7

.dockerignore

@@ -1,4 +1 @@
-node_modules
+backend
-dist
-.git
-.github

.github/workflows/publish-container.yml

@@ -1,50 +0,0 @@
-name: Publish Container
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  schedule:
-    - cron: "0 0 * * 0"
-
-jobs:
-  publish:
-    name: Publish rfd-fyi
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Prepare
-        id: prep
-        run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/rfd-fyi
-          VERSION=${GITHUB_REF##*/}
-          if [[ $GITHUB_REF == refs/heads/main ]]; then
-            VERSION=latest
-          fi
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-          TAGS="${IMAGE_NAME}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            TAGS="$TAGS,${IMAGE_NAME}:latest"
-          fi
-          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build / push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.ref == 'refs/heads/main' }}
-          tags: ${{ steps.prep.outputs.tags }}

.github/workflows/publish-containers.yml

@@ -0,0 +1,98 @@
+name: Publish Containers
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  publish-backend:
+    name: Publish rfd-fyi-backend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Prepare
+        id: prep
+        run: |
+          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/rfd-fyi-backend
+          VERSION=${GITHUB_REF##*/}
+          if [[ $GITHUB_REF == refs/heads/main ]]; then
+            VERSION=latest
+          fi
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          TAGS="${IMAGE_NAME}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${IMAGE_NAME}:latest"
+          fi
+          echo ::set-output name=tags::${TAGS}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: dhi.io
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Packages Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build / push
+        uses: docker/build-push-action@v6
+        with:
+          context: backend
+          file: ./backend/Dockerfile
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: ${{ steps.prep.outputs.tags }}
+
+  publish-frontend:
+    name: Publish rfd-fyi-frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Prepare
+        id: prep
+        run: |
+          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/rfd-fyi-frontend
+          VERSION=${GITHUB_REF##*/}
+          if [[ $GITHUB_REF == refs/heads/main ]]; then
+            VERSION=latest
+          fi
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          TAGS="${IMAGE_NAME}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS,${IMAGE_NAME}:latest"
+          fi
+          echo ::set-output name=tags::${TAGS}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Packages Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build / push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: ${{ steps.prep.outputs.tags }}

.gitignore

@@ -1,5 +1,5 @@
 node_modules
-/dist
+dist
 data/
 backend/bin/
 .vscode

Caddyfile

@@ -0,0 +1,8 @@
+{
+    auto_https off
+}
+
+:80 {
+    file_server
+    reverse_proxy /api/* rfd-fyi-backend:8080
+}

Dockerfile

@@ -1,20 +1,19 @@
-# Build frontend
+FROM dhi.io/node:25-debian13-dev as builder
-FROM dhi.io/node:25-debian13-dev AS frontend-builder
+
 WORKDIR /app
+
 COPY package*.json ./
+
 RUN npm install
+
 COPY . .
+
 RUN npm run build
 
-# Build backend (with embedded frontend)
+FROM dhi.io/caddy:2 as runtime
-FROM dhi.io/golang:1.26-debian13-dev AS backend-builder
-WORKDIR /src
-COPY backend /src
-COPY --from=frontend-builder /app/dist /src/dist
-RUN CGO_ENABLED=0 go build -o rfd-fyi .
 
-FROM dhi.io/static:20251003-musl-alpine3.23 AS runtime
+WORKDIR /my-site
-COPY --from=backend-builder /src/rfd-fyi /rfd-fyi
 
-EXPOSE 8080
+COPY --from=builder /app/dist ./
-ENTRYPOINT ["/rfd-fyi"]
+
+COPY Caddyfile /etc/caddy/Caddyfile

Makefile

@@ -15,7 +15,7 @@ help:
 
 ## backend: Build and run the backend from source
 backend:
-	@cd backend && CGO_ENABLED=0 HTTP_PORT=8080 go run .
+	@cd backend && CGO_ENABLED=0 go run .
 .PHONY: backend
 
 ## frontend: Build and run the frontend from source
@@ -23,21 +23,20 @@ frontend:
 	@npm run serve
 .PHONY: frontend
 
-## dev: Build and run in Docker
+## dev: Build and run in docker compose
 dev:
-	docker build -t rfd-fyi:dev .
+	docker compose up --build -d
-	docker run -d --name rfd-fyi-dev -p 8080:8080 rfd-fyi:dev
 .PHONY: dev
 
-## prod: Run the latest image in Docker
+## prod: Run the latest images in docker compose
 prod:
 	@git pull
-	@docker pull ghcr.io/davegallant/rfd-fyi
+	@docker pull ghcr.io/davegallant/rfd-fyi-backend
-	@docker run -d --name rfd-fyi-prod -p 8080:8080 ghcr.io/davegallant/rfd-fyi
+	@docker pull ghcr.io/davegallant/rfd-fyi-frontend
+	@docker compose -f docker-compose.prod.yml up -d
 .PHONY: prod
 
-## teardown: Teardown Docker
+## teardown: Teardown docker
 teardown:
-	docker stop rfd-fyi-dev rfd-fyi-prod || true
+	docker compose down
-	docker rm rfd-fyi-dev rfd-fyi-prod || true
 .PHONY: teardown

backend/Dockerfile

@@ -0,0 +1,15 @@
+FROM dhi.io/golang:1.26-debian13-dev AS build
+
+WORKDIR /src
+
+COPY . /src
+
+RUN CGO_ENABLED=0 go build -o backend .
+
+FROM dhi.io/static:20251003-musl-alpine3.23
+
+COPY --from=build /src/backend /backend
+
+EXPOSE 8080
+
+CMD [ "/backend" ]

backend/app.go

@@ -1,11 +1,9 @@
 package main
 
 import (
-	"embed"
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/fs"
 	"math/rand/v2"
 	"net/http"
 	"net/url"
@@ -19,8 +17,20 @@ import (
 	"github.com/gorilla/mux"
 )
 
-//go:embed dist/*
+// @title           RFD FYI API
-var frontendFS embed.FS
+// @version         1.0
+// @description     An API for issue tracking
+// @termsOfService  http://swagger.io/terms/
+
+// @contact.name   API Support
+// @contact.url    https://linktr.ee/davegallant
+// @contact.email  davegallant@gmail.com
+
+// @license.name  Apache 2.0
+// @license.url   http://www.apache.org/licenses/LICENSE-2.0.html
+
+// @host      localhost:8080
+// @BasePath  /api/v1
 
 type App struct {
 	Router        *mux.Router
@@ -38,45 +48,22 @@ type Redirect struct {
 func (a *App) Initialize() {
 	a.BasePath = "/api/v1"
 
-	a.Router = mux.NewRouter()
+	a.Router = mux.NewRouter().PathPrefix(a.BasePath).Subrouter()
+	http.Handle("/", a.Router)
+
 	a.initializeRoutes()
 }
 
 func (a *App) Run(httpPort string) {
 	log.Info().Msgf("Serving requests on port " + httpPort)
-	if err := http.ListenAndServe(fmt.Sprintf(":%s", httpPort), a.Router); err != nil {
+	if err := http.ListenAndServe(fmt.Sprintf(":"+httpPort), nil); err != nil {
 		panic(err)
 	}
 }
 
 func (a *App) initializeRoutes() {
-	a.Router.HandleFunc(a.BasePath+"/topics", a.listTopics).Methods("GET")
+	a.Router.HandleFunc("/topics", a.listTopics).Methods("GET")
-	a.Router.HandleFunc(a.BasePath+"/topics/{id}", a.getTopicDetails).Methods("GET")
+	a.Router.HandleFunc("/topics/{id}", a.getTopicDetails).Methods("GET")
-
-	distFS, err := fs.Sub(frontendFS, "dist")
-	if err != nil {
-		panic(err)
-	}
-	fileServer := http.FileServer(http.FS(distFS))
-	a.Router.PathPrefix("/").Handler(spaHandler{staticHandler: fileServer, staticFS: distFS})
-}
-
-// spaHandler serves static files when they exist, otherwise falls back to
-// index.html so that client-side routing works.
-type spaHandler struct {
-	staticHandler http.Handler
-	staticFS      fs.FS
-}
-
-func (h spaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	path := strings.TrimPrefix(r.URL.Path, "/")
-	if path == "" {
-		path = "index.html"
-	}
-	if _, err := fs.Stat(h.staticFS, path); err != nil {
-		r.URL.Path = "/"
-	}
-	h.staticHandler.ServeHTTP(w, r)
 }
 
 // func respondWithError(w http.ResponseWriter, code int, message string) {

backend/dist/index.html

@@ -1,6 +0,0 @@
-<!doctype html>
-<html>
-<body>
-<p>Run the Vite dev server for the frontend.</p>
-</body>
-</html>

backend/main.go

@@ -11,6 +11,21 @@ import (
 	utils "github.com/davegallant/rfd-fyi/pkg/utils"
 )
 
+// @title           RFD FYI API
+// @version         1.0
+// @description     An API for an issue tracking service
+// @termsOfService  http://swagger.io/terms/
+
+// @contact.name   API Support
+// @contact.url    http://www.swagger.io/support
+// @contact.email  support@swagger.io
+
+// @license.name  Apache 2.0
+// @license.url   http://www.apache.org/licenses/LICENSE-2.0.html
+
+// @host      localhost:8080
+// @BasePath  /api/v1
+
 func main() {
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 

docker-compose.prod.yml

@@ -0,0 +1,16 @@
+services:
+  frontend:
+    image: ghcr.io/davegallant/rfd-fyi-frontend
+    ports:
+      - 80:80
+      - 443:443
+    links:
+      - "backend:backend"
+    volumes:
+      - ./data:/data
+    restart: always
+  backend:
+    image: ghcr.io/davegallant/rfd-fyi-backend
+    ports:
+      - 8080:8080
+    restart: always

docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  frontend:
+    build:
+      dockerfile: Dockerfile
+      context: .
+    ports:
+      - 80:80
+      - 443:443
+    links:
+      - "backend:backend"
+    volumes:
+      - ./data:/data
+  backend:
+    build:
+      dockerfile: Dockerfile
+      context: backend
+    ports:
+      - 8080:8080