Merge pull request #79 from hhftechnology/dev

V4. Migrated to api from override file.

Author: hhftechnology

.github/workflows/main.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - dev
+      - dev-docs
     paths:
       - 'Dockerfile'
       - 'go.mod'

.gitignore

@@ -33,7 +33,7 @@ go.work
 
 # Node modules and builds
 ui/node_modules/
-ui/build/
+ui/dist/
 
 # SQLite database
 *.db
@@ -45,4 +45,4 @@ ui/build/
 *.log
 
 # Data directories
-/data/
+/data/

Dockerfile

@@ -1,66 +1,51 @@
-# Build UI stage
+# Build UI stage (Vite + TypeScript + Shadcn UI)
 FROM node:18-alpine AS ui-builder
 
 WORKDIR /app
 
-# Copy package manifests first from host's ui/src
-COPY ui/src/package.json ui/src/package-lock.json* ./
+# Copy package manifests for ui
+COPY ui/package.json ui/package-lock.json* ./
 
 # Install dependencies
 RUN npm install
 
-# Create the target directories for source and public files within the container
-RUN mkdir src public
+# Copy all ui source files
+COPY ui/ ./
 
-# Copy contents of host's ui/public into container's /app/public
-COPY ui/public/ ./public/
-
-# Copy *specific* source files and directories from host's ui/src into container's /app/src
-COPY ui/src/styles ./src/styles
-COPY ui/src/components ./src/components
-COPY ui/src/contexts ./src/contexts
-COPY ui/src/services ./src/services
-COPY ui/src/App.js ./src/App.js
-COPY ui/src/index.js ./src/index.js
-
-
-# Verify structure
-RUN echo "--- Contents of /app/public ---"
-RUN ls -la public
-RUN echo "--- Contents of /app/src ---"
-RUN ls -la src
-
-# Build the UI (runs in /app, expects ./src, ./public relative to package.json)
+# Build the UI
 RUN npm run build
 
-# Verify build output
-RUN echo "--- Contents of build ---"
-RUN ls -la build/
+# Build Go stage - using Debian for glibc compatibility with go-sqlite3
+FROM golang:1.24-bookworm AS go-builder
 
-
-# Build Go stage
-FROM golang:1.19-alpine AS go-builder
-
-# Install build dependencies for Go
-RUN apk add --no-cache gcc musl-dev
+# Install build dependencies for Go with CGO and static linking
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gcc \
+    libc6-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-# Copy go.mod and go.sum files
+# Copy go.mod and go.sum files first for better layer caching
 COPY go.mod go.sum ./
 
-# Download Go dependencies
+# Download Go dependencies (this layer is cached if go.mod/go.sum don't change)
 RUN go mod download
 
 # Copy the Go source code
 COPY . .
 
-# Build the Go application
-RUN CGO_ENABLED=1 GOOS=linux go build -o middleware-manager .
+# Ensure go.sum is up to date and build the application
+# Using CGO for SQLite support with static linking for Alpine compatibility
+# The -extldflags '-static' creates a statically linked binary
+RUN go mod tidy && \
+    CGO_ENABLED=1 GOOS=linux \
+    go build -ldflags="-s -w -extldflags '-static'" -o middleware-manager .
 
-# Final stage
-FROM alpine:3.16
+# Final stage - minimal runtime image
+FROM alpine:3.18
 
+# Install runtime dependencies
 RUN apk add --no-cache ca-certificates sqlite curl tzdata
 
 WORKDIR /app
@@ -69,11 +54,11 @@ WORKDIR /app
 COPY --from=go-builder /app/middleware-manager /app/middleware-manager
 
 # Copy UI build files from UI builder stage
-# The build output is in /app/build in the ui-builder stage
-COPY --from=ui-builder /app/build /app/ui/build
+COPY --from=ui-builder /app/dist /app/ui/dist
 
 # Copy configuration files
 COPY --from=go-builder /app/config/templates.yaml /app/config/templates.yaml
+COPY --from=go-builder /app/config/templates_services.yaml /app/config/templates_services.yaml
 
 # Copy database migrations file
 COPY --from=go-builder /app/database/migrations.sql /app/database/migrations.sql
@@ -92,5 +77,9 @@ ENV PANGOLIN_API_URL=http://pangolin:3001/api/v1 \
 # Expose the port
 EXPOSE 3456
 
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost:3456/health || exit 1
+
 # Run the application
 CMD ["/app/middleware-manager"]

Makefile

@@ -12,7 +12,7 @@ all: build
 # Build everything
 build: build-ui build-backend
 
-# Build UI
+# Build UI (Vite + TypeScript)
 build-ui:
 	@echo "Building UI..."
 	cd ui && npm install && npm run build
@@ -31,7 +31,7 @@ run: build
 clean:
 	@echo "Cleaning..."
 	rm -f $(APP_NAME)
-	rm -rf ui/build
+	rm -rf ui/dist
 
 # Build Docker image
 docker-build: build
@@ -56,11 +56,21 @@ dev:
 # Run the UI in development mode
 dev-ui:
 	@echo "Running UI in development mode..."
-	cd ui && npm start
+	cd ui && npm run dev
 
 # Install dependencies
 deps:
 	@echo "Installing Go dependencies..."
 	go mod download
 	@echo "Installing UI dependencies..."
-	cd ui && npm install
+	cd ui && npm install
+
+# Type check the UI
+typecheck:
+	@echo "Type checking UI..."
+	cd ui && npm run typecheck
+
+# Lint the UI
+lint-ui:
+	@echo "Linting UI..."
+	cd ui && npm run lint