fix add missing files

This commit is contained in:
2026-05-18 09:40:28 +02:00
parent 3b4a841bf5
commit ad64766cd6
6 changed files with 62 additions and 28 deletions

View File

@ -1,9 +1,14 @@
# Server # Mot de passe Gitea (optionnel — si absent, le script le demande interactivement)
JWT_SECRET=change-me-to-a-random-secret GITEA_PASSWORD=ton-mot-de-passe
# Token for the local agent (generate with: uuidgen) # Serveur
JWT_SECRET=change-me-to-a-random-secret
ADMIN_USER=admin
ADMIN_PASSWORD=change-me
# Token pour l'agent local (même VM que le serveur)
LOCAL_AGENT_TOKEN=change-me-to-a-random-token LOCAL_AGENT_TOKEN=change-me-to-a-random-token
# Remote agents only (docker-compose.agent.yml) # Agents distants uniquement (docker-compose.agent.yml)
CONTAINARR_SERVER_URL=http://<your-server-ip>:9090 CONTAINARR_SERVER_URL=http://<ip-du-serveur>:9090
CONTAINARR_AGENT_TOKEN=<token-generated-by-server> CONTAINARR_AGENT_TOKEN=<token-généré-par-le-serveur>

3
.gitignore vendored
View File

@ -20,6 +20,9 @@ web/.env.*
# ── Docker ──────────────────────────────────────────────────────────────────── # ── Docker ────────────────────────────────────────────────────────────────────
*.tar *.tar
# ── Scripts locaux ────────────────────────────────────────────────────────────
push.sh
# ── Données & secrets ───────────────────────────────────────────────────────── # ── Données & secrets ─────────────────────────────────────────────────────────
*.db *.db
*.db-wal *.db-wal

View File

@ -1,9 +1,6 @@
services: services:
agent: agent:
image: ghcr.io/containarr/agent:latest # or build locally image: gitea.anthonybouteiller.ovh/blomios/containarr-agent:latest
# build:
# context: .
# dockerfile: agent/Dockerfile
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro

View File

@ -1,8 +1,6 @@
services: services:
server: server:
build: image: gitea.anthonybouteiller.ovh/blomios/containarr-server:latest
context: ./server
image: containarr-server:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- "8080:8080" # HTTP + WebSocket (PWA) - "8080:8080" # HTTP + WebSocket (PWA)
@ -18,12 +16,8 @@ services:
ADMIN_PASSWORD: "${ADMIN_PASSWORD}" ADMIN_PASSWORD: "${ADMIN_PASSWORD}"
BOOTSTRAP_TOKENS: "local:${LOCAL_AGENT_TOKEN}" BOOTSTRAP_TOKENS: "local:${LOCAL_AGENT_TOKEN}"
# Agent for the local VM (same host as the server).
agent: agent:
build: image: gitea.anthonybouteiller.ovh/blomios/containarr-agent:latest
context: .
dockerfile: agent/Dockerfile
image: containarr-agent:latest
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- server - server

View File

@ -1,20 +1,33 @@
FROM golang:1.23-alpine AS builder # Context: project root
# docker build -f server/Dockerfile -t containarr-server .
# ── Stage 1 : build SvelteKit ─────────────────────────────────────────────────
FROM node:20-alpine AS web-builder
WORKDIR /web
COPY web/package*.json ./
RUN npm ci
COPY web/ ./
RUN npm run build
# Output: /web/build/
# ── Stage 2 : build Go server ─────────────────────────────────────────────────
FROM golang:1.23-alpine AS go-builder
RUN apk add --no-cache gcc musl-dev RUN apk add --no-cache gcc musl-dev
WORKDIR /src WORKDIR /src
COPY go.mod go.sum ./ COPY server/go.mod server/go.sum ./
COPY . . RUN go mod download
RUN go mod tidy && CGO_ENABLED=1 GOOS=linux go build -ldflags="-s -w" -o /bin/containarr-server ./cmd/server COPY server/ ./
RUN CGO_ENABLED=1 GOOS=linux go build -ldflags="-s -w" -o /bin/containarr-server ./cmd/server
# ── Runtime ─────────────────────────────────────────────────────────────────── # ── Stage 3 : image finale ────────────────────────────────────────────────────
FROM alpine:3.20 FROM alpine:3.20
RUN apk add --no-cache ca-certificates tzdata RUN apk add --no-cache ca-certificates tzdata
COPY --from=builder /bin/containarr-server /usr/local/bin/containarr-server WORKDIR /app
COPY --from=go-builder /bin/containarr-server ./containarr-server
COPY --from=web-builder /web/build ./web/build
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 8080 9090 EXPOSE 8080 9090
ENTRYPOINT ["containarr-server"] ENTRYPOINT ["/app/containarr-server"]

View File

@ -2,11 +2,33 @@ package api
import ( import (
"net/http" "net/http"
"os"
"path/filepath"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware" "github.com/go-chi/chi/v5/middleware"
) )
const webBuildDir = "./web/build"
// spaHandler serves static files from dir and falls back to index.html for
// any path that does not match an existing file on disk. This supports
// SvelteKit (adapter-static, fallback: "index.html") running as a SPA.
func spaHandler(dir string) http.HandlerFunc {
fs := http.FileServer(http.Dir(dir))
return func(w http.ResponseWriter, r *http.Request) {
// Resolve the requested path inside the build directory.
abs := filepath.Join(dir, filepath.Clean("/"+r.URL.Path))
if info, err := os.Stat(abs); err == nil && !info.IsDir() {
// File exists — serve it normally (assets, icons, _app/*, …).
fs.ServeHTTP(w, r)
return
}
// No matching file found: serve the SPA entry point.
http.ServeFile(w, r, filepath.Join(dir, "index.html"))
}
}
func NewRouter(h *Handler) http.Handler { func NewRouter(h *Handler) http.Handler {
r := chi.NewRouter() r := chi.NewRouter()
r.Use(middleware.Logger) r.Use(middleware.Logger)
@ -29,7 +51,7 @@ func NewRouter(h *Handler) http.Handler {
}) })
}) })
r.Handle("/*", http.FileServer(http.Dir("./web/dist"))) r.Handle("/*", spaHandler(webBuildDir))
return r return r
} }