BlueGit

timfa bluegit

Merged

Runner-webinterface, beheer ingebouwde runner en /help

!53 · merged 3 weeks ago

timfa wants to merge 1 commit from cursor/runner-ui into stage

Pipeline

#214 Passed
Stage: build

Reviews

  • No reviews yet.

Merged by timfa on 24 October 2026 0630b379

Overview Commits 1 Pipelines 1 Changes 38

Changes

38 files changed +3984 −54
cmd/bluegit-runner/main.go +141 −9
@@ -27,12 +27,16 @@ import (
27 27 "gopkg.in/yaml.v3"
28 28
29 29 "gitlab.com/Timfa/bluegit/internal/runner"
30 "gitlab.com/Timfa/bluegit/internal/runnercfg"
30 31 )
31 32
32 33 var version = "dev"
33 34
34 35 const defaultConfig = "/etc/bluegit-runner/config.yml"
35 36
37 // maxWorkers is de bovengrens voor concurrency.
38 const maxWorkers = 64
39
36 40 // Config staat in /etc/bluegit-runner/config.yml.
37 41 type Config struct {
38 42 URL string `yaml:"url"`
@@ -43,6 +47,10 @@ type Config struct {
43 47 WorkDir string `yaml:"work_dir"`
44 48 Network string `yaml:"network"`
45 49 Concurrency int `yaml:"concurrency"`
50 // UIListen is het adres van de webinterface; "off" zet hem uit.
51 UIListen string `yaml:"ui_listen"`
52 // Language is de standaardtaal van de webinterface (en, nl, de, fr).
53 Language string `yaml:"language"`
46 54 }
47 55
48 56 func (c *Config) defaults() {
@@ -61,6 +69,9 @@ func (c *Config) defaults() {
61 69 if c.Concurrency < 1 {
62 70 c.Concurrency = 1
63 71 }
72 if c.UIListen == "" {
73 c.UIListen = defaultUIListen
74 }
64 75 c.URL = strings.TrimRight(c.URL, "/")
65 76 }
66 77
@@ -75,6 +86,8 @@ func main() {
75 86 err = cmdRegister(os.Args[2:])
76 87 case "run":
77 88 err = cmdRun(os.Args[2:])
89 case "ui-token":
90 err = cmdUIToken(os.Args[2:])
78 91 case "version", "--version":
79 92 fmt.Println(version)
80 93 default:
@@ -91,6 +104,7 @@ func usage() {
91 104 fmt.Fprintln(os.Stderr, `usage:
92 105 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
93 106 bluegit-runner run [--config PATH]
107 bluegit-runner ui-token [--config PATH] (shows the web UI admin token)
94 108 bluegit-runner version`)
95 109 }
96 110
@@ -172,6 +186,7 @@ func cmdRegister(args []string) error {
172 186 }
173 187 }
174 188 fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
189 fmt.Printf("web UI: http://%s (admin token: sudo bluegit-runner ui-token)\n", defaultUIListen)
175 190 // Met het AUR-pakket: de service is al enabled en wacht op de config.
176 191 if os.Geteuid() == 0 && *cfgPath == defaultConfig {
177 192 if _, err := os.Stat("/usr/lib/systemd/system/bluegit-runner.service"); err == nil {
@@ -190,6 +205,78 @@ type client struct {
190 205 cfg Config
191 206 http *http.Client
192 207 log *slog.Logger
208 // beheer (webinterface)
209 file *runnercfg.File
210 jobs *runnercfg.Tracker
211 stMu sync.Mutex
212 seen time.Time
213 srvName string
214 srvPause bool
215 }
216
217 func (c *client) settings() runnercfg.Settings {
218 s, err := c.file.Load(c.defaults())
219 if err != nil {
220 return c.defaults()
221 }
222 return s
223 }
224
225 func (c *client) defaults() runnercfg.Settings {
226 d := runnercfg.Defaults()
227 d.Concurrency = c.cfg.Concurrency
228 return d
229 }
230
231 func (c *client) status() runnercfg.Status {
232 c.stMu.Lock()
233 defer c.stMu.Unlock()
234 name := c.settings().Name
235 if name == "" {
236 name = c.srvName
237 }
238 if name == "" {
239 name = c.cfg.Name
240 }
241 return runnercfg.Status{Kind: "standalone", Name: name, Version: version, ServerURL: c.cfg.URL,
242 Online: !c.seen.IsZero() && time.Since(c.seen) < 90*time.Second, LastContact: c.seen, ServerPause: c.srvPause}
243 }
244
245 // heartbeat meldt pauze en (lokaal ingestelde) naam aan de server.
246 func (c *client) heartbeat(ctx context.Context) error {
247 s := c.settings()
248 var out struct {
249 Name string `json:"name"`
250 Paused bool `json:"paused"`
251 }
252 err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]any{"draining": s.Paused, "name": s.Name}, &out)
253 if err == nil {
254 c.stMu.Lock()
255 c.seen, c.srvName, c.srvPause = time.Now(), out.Name, out.Paused
256 c.stMu.Unlock()
257 }
258 return err
259 }
260
261 func cmdUIToken(args []string) error {
262 fs := flag.NewFlagSet("ui-token", flag.ExitOnError)
263 cfgPath := fs.String("config", defaultConfig, "config file")
264 _ = fs.Parse(args)
265 b, err := os.ReadFile(*cfgPath)
266 if err != nil {
267 return err
268 }
269 var cfg Config
270 if err := yaml.Unmarshal(b, &cfg); err != nil {
271 return err
272 }
273 cfg.defaults()
274 tok, _, err := ensureUIToken(cfg)
275 if err != nil {
276 return fmt.Errorf("%w (run as root or as bluegit-runner)", err)
277 }
278 fmt.Printf("web UI: http://%s\nadmin token: %s\n", cfg.UIListen, tok)
279 return nil
193 280 }
194 281
195 282 func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
@@ -234,11 +321,32 @@ func cmdRun(args []string) error {
234 321 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
235 322 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
236 323 defer stop()
237 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log}
238 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil {
324 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log,
325 file: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, jobs: &runnercfg.Tracker{}}
326 c.jobs.SetPaused(c.settings().Paused)
327 if err := c.heartbeat(ctx); err != nil {
239 328 return fmt.Errorf("cannot reach BlueGit: %w", err)
240 329 }
241 log.Info("bluegit-runner started", "url", cfg.URL, "name", cfg.Name, "version", version, "concurrency", cfg.Concurrency)
330 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
331 if cfg.UIListen != "off" {
332 tok, created, err := ensureUIToken(cfg)
333 if err != nil {
334 log.Warn("web UI token", "err", err)
335 } else {
336 h := &runnercfg.Handler{File: c.file, Default: c.defaults(), Tracker: c.jobs, WorkDir: cfg.WorkDir,
337 Status: c.status, Apply: func(runnercfg.Settings) error {
338 hctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
339 defer cancel()
340 _ = c.heartbeat(hctx) // naam en pauze meteen naar de server
341 return nil
342 }}
343 if err := serveUI(ctx, newWebUI(cfg, tok, h), cfg.UIListen, log.Warn); err != nil {
344 log.Warn("web UI", "listen", cfg.UIListen, "err", err)
345 } else {
346 log.Info("web UI", "url", "http://"+cfg.UIListen, "first_start", created, "token", "see: bluegit-runner ui-token")
347 }
348 }
349 }
242 350 go func() {
243 351 t := time.NewTicker(30 * time.Second)
244 352 defer t.Stop()
@@ -247,18 +355,27 @@ func cmdRun(args []string) error {
247 355 case <-ctx.Done():
248 356 return
249 357 case <-t.C:
250 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil && ctx.Err() == nil {
358 if err := c.heartbeat(ctx); err != nil && ctx.Err() == nil {
251 359 log.Warn("heartbeat", "err", err)
252 360 }
253 361 }
254 362 }
255 363 }()
256 364 var wg sync.WaitGroup
257 for i := 0; i < cfg.Concurrency; i++ {
365 // Een vaste pool; worker i werkt alleen als i < concurrency en niet gepauzeerd.
366 for i := 0; i < maxWorkers; i++ {
258 367 wg.Add(1)
259 go func() {
368 go func(i int) {
260 369 defer wg.Done()
261 370 for ctx.Err() == nil {
371 s := c.settings()
372 if s.Paused || i >= s.Concurrency {
373 select {
374 case <-ctx.Done():
375 case <-time.After(2 * time.Second):
376 }
377 continue
378 }
262 379 ran, err := c.poll(ctx)
263 380 if err != nil && ctx.Err() == nil {
264 381 log.Warn("poll", "err", err)
@@ -271,7 +388,7 @@ func cmdRun(args []string) error {
271 388 stop()
272 389 }
273 390 }
274 }()
391 }(i)
275 392 }
276 393 wg.Wait()
277 394 return nil
@@ -326,6 +443,9 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
326 443 ctx, cancel := context.WithCancel(parent)
327 444 defer cancel()
328 445 runCtx := ctx
446 if m := c.settings().JobTimeoutMin; m > 0 && (pl.Timeout <= 0 || int64(m*60) < pl.Timeout) {
447 pl.Timeout = int64(m * 60)
448 }
329 449 if pl.Timeout > 0 {
330 450 var tc context.CancelFunc
331 451 runCtx, tc = context.WithTimeout(ctx, time.Duration(pl.Timeout)*time.Second)
@@ -385,9 +505,20 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
385 505 }
386 506 }
387 507 }()
388 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.cfg.Name}
508 st := c.settings()
509 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.status().Name}
510 if over, oerr := st.Overrides(c.cfg.WorkDir, nil); oerr == nil {
511 r.Configure(st, over)
512 }
513 c.jobs.Start(runnercfg.JobInfo{ID: pl.JobID, Name: pl.Job.Name, Pipeline: pl.PipelineID, Image: pl.Job.Image,
514 Project: pl.Env["CI_PROJECT_PATH"], URL: pl.Env["CI_JOB_URL"]})
389 515 work := filepath.Join(c.cfg.WorkDir, "work", strconv.FormatInt(pl.JobID, 10))
390 defer os.RemoveAll(work)
516 defer func() {
517 if st.CleanupWork {
518 _ = os.RemoveAll(work)
519 }
520 runnercfg.Cleanup(context.Background(), c.cfg.Docker, c.settings(), c.jobs, filepath.Join(c.cfg.WorkDir, "cache"))
521 }()
391 522 clone := func(ctx context.Context, dir string) error {
392 523 cmd := exec.CommandContext(ctx, c.cfg.Git, "clone", "--quiet", pl.CloneURL, dir)
393 524 // Het runner-token via de omgeving, niet in de proceslijst.
@@ -435,6 +566,7 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
435 566 if ferr := c.postJSON(fctx, base+"/finish", map[string]string{"status": status, "message": msg}, nil); ferr != nil {
436 567 c.log.Error("finish", "job", pl.JobID, "err", ferr)
437 568 }
569 c.jobs.Finish(pl.JobID, status)
438 570 c.log.Info("job done", "id", pl.JobID, "status", status)
439 571 }
440 572
@@ -27,12 +27,16 @@ import (
27 "gopkg.in/yaml.v3"
27 "gopkg.in/yaml.v3"
28
28
29 "gitlab.com/Timfa/bluegit/internal/runner"
29 "gitlab.com/Timfa/bluegit/internal/runner"
30 "gitlab.com/Timfa/bluegit/internal/runnercfg"
30)
31)
31
32
32var version = "dev"
33var version = "dev"
33
34
34const defaultConfig = "/etc/bluegit-runner/config.yml"
35const defaultConfig = "/etc/bluegit-runner/config.yml"
35
36
37// maxWorkers is de bovengrens voor concurrency.
38const maxWorkers = 64
39
36// Config staat in /etc/bluegit-runner/config.yml.
40// Config staat in /etc/bluegit-runner/config.yml.
37type Config struct {
41type Config struct {
38 URL string `yaml:"url"`
42 URL string `yaml:"url"`
@@ -43,6 +47,10 @@ type Config struct {
43 WorkDir string `yaml:"work_dir"`
47 WorkDir string `yaml:"work_dir"`
44 Network string `yaml:"network"`
48 Network string `yaml:"network"`
45 Concurrency int `yaml:"concurrency"`
49 Concurrency int `yaml:"concurrency"`
50 // UIListen is het adres van de webinterface; "off" zet hem uit.
51 UIListen string `yaml:"ui_listen"`
52 // Language is de standaardtaal van de webinterface (en, nl, de, fr).
53 Language string `yaml:"language"`
46}
54}
47
55
48func (c *Config) defaults() {
56func (c *Config) defaults() {
@@ -61,6 +69,9 @@ func (c *Config) defaults() {
61 if c.Concurrency < 1 {
69 if c.Concurrency < 1 {
62 c.Concurrency = 1
70 c.Concurrency = 1
63 }
71 }
72 if c.UIListen == "" {
73 c.UIListen = defaultUIListen
74 }
64 c.URL = strings.TrimRight(c.URL, "/")
75 c.URL = strings.TrimRight(c.URL, "/")
65}
76}
66
77
@@ -75,6 +86,8 @@ func main() {
75 err = cmdRegister(os.Args[2:])
86 err = cmdRegister(os.Args[2:])
76 case "run":
87 case "run":
77 err = cmdRun(os.Args[2:])
88 err = cmdRun(os.Args[2:])
89 case "ui-token":
90 err = cmdUIToken(os.Args[2:])
78 case "version", "--version":
91 case "version", "--version":
79 fmt.Println(version)
92 fmt.Println(version)
80 default:
93 default:
@@ -91,6 +104,7 @@ func usage() {
91 fmt.Fprintln(os.Stderr, `usage:
104 fmt.Fprintln(os.Stderr, `usage:
92 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
105 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
93 bluegit-runner run [--config PATH]
106 bluegit-runner run [--config PATH]
107 bluegit-runner ui-token [--config PATH] (shows the web UI admin token)
94 bluegit-runner version`)
108 bluegit-runner version`)
95}
109}
96
110
@@ -172,6 +186,7 @@ func cmdRegister(args []string) error {
172 }
186 }
173 }
187 }
174 fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
188 fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
189 fmt.Printf("web UI: http://%s (admin token: sudo bluegit-runner ui-token)\n", defaultUIListen)
175 // Met het AUR-pakket: de service is al enabled en wacht op de config.
190 // Met het AUR-pakket: de service is al enabled en wacht op de config.
176 if os.Geteuid() == 0 && *cfgPath == defaultConfig {
191 if os.Geteuid() == 0 && *cfgPath == defaultConfig {
177 if _, err := os.Stat("/usr/lib/systemd/system/bluegit-runner.service"); err == nil {
192 if _, err := os.Stat("/usr/lib/systemd/system/bluegit-runner.service"); err == nil {
@@ -190,6 +205,78 @@ type client struct {
190 cfg Config
205 cfg Config
191 http *http.Client
206 http *http.Client
192 log *slog.Logger
207 log *slog.Logger
208 // beheer (webinterface)
209 file *runnercfg.File
210 jobs *runnercfg.Tracker
211 stMu sync.Mutex
212 seen time.Time
213 srvName string
214 srvPause bool
215}
216
217func (c *client) settings() runnercfg.Settings {
218 s, err := c.file.Load(c.defaults())
219 if err != nil {
220 return c.defaults()
221 }
222 return s
223}
224
225func (c *client) defaults() runnercfg.Settings {
226 d := runnercfg.Defaults()
227 d.Concurrency = c.cfg.Concurrency
228 return d
229}
230
231func (c *client) status() runnercfg.Status {
232 c.stMu.Lock()
233 defer c.stMu.Unlock()
234 name := c.settings().Name
235 if name == "" {
236 name = c.srvName
237 }
238 if name == "" {
239 name = c.cfg.Name
240 }
241 return runnercfg.Status{Kind: "standalone", Name: name, Version: version, ServerURL: c.cfg.URL,
242 Online: !c.seen.IsZero() && time.Since(c.seen) < 90*time.Second, LastContact: c.seen, ServerPause: c.srvPause}
243}
244
245// heartbeat meldt pauze en (lokaal ingestelde) naam aan de server.
246func (c *client) heartbeat(ctx context.Context) error {
247 s := c.settings()
248 var out struct {
249 Name string `json:"name"`
250 Paused bool `json:"paused"`
251 }
252 err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]any{"draining": s.Paused, "name": s.Name}, &out)
253 if err == nil {
254 c.stMu.Lock()
255 c.seen, c.srvName, c.srvPause = time.Now(), out.Name, out.Paused
256 c.stMu.Unlock()
257 }
258 return err
259}
260
261func cmdUIToken(args []string) error {
262 fs := flag.NewFlagSet("ui-token", flag.ExitOnError)
263 cfgPath := fs.String("config", defaultConfig, "config file")
264 _ = fs.Parse(args)
265 b, err := os.ReadFile(*cfgPath)
266 if err != nil {
267 return err
268 }
269 var cfg Config
270 if err := yaml.Unmarshal(b, &cfg); err != nil {
271 return err
272 }
273 cfg.defaults()
274 tok, _, err := ensureUIToken(cfg)
275 if err != nil {
276 return fmt.Errorf("%w (run as root or as bluegit-runner)", err)
277 }
278 fmt.Printf("web UI: http://%s\nadmin token: %s\n", cfg.UIListen, tok)
279 return nil
193}
280}
194
281
195func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
282func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
@@ -234,11 +321,32 @@ func cmdRun(args []string) error {
234 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
321 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
235 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
322 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
236 defer stop()
323 defer stop()
237 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log}
324 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log,
238 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil {
325 file: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, jobs: &runnercfg.Tracker{}}
326 c.jobs.SetPaused(c.settings().Paused)
327 if err := c.heartbeat(ctx); err != nil {
239 return fmt.Errorf("cannot reach BlueGit: %w", err)
328 return fmt.Errorf("cannot reach BlueGit: %w", err)
240 }
329 }
241 log.Info("bluegit-runner started", "url", cfg.URL, "name", cfg.Name, "version", version, "concurrency", cfg.Concurrency)
330 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
331 if cfg.UIListen != "off" {
332 tok, created, err := ensureUIToken(cfg)
333 if err != nil {
334 log.Warn("web UI token", "err", err)
335 } else {
336 h := &runnercfg.Handler{File: c.file, Default: c.defaults(), Tracker: c.jobs, WorkDir: cfg.WorkDir,
337 Status: c.status, Apply: func(runnercfg.Settings) error {
338 hctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
339 defer cancel()
340 _ = c.heartbeat(hctx) // naam en pauze meteen naar de server
341 return nil
342 }}
343 if err := serveUI(ctx, newWebUI(cfg, tok, h), cfg.UIListen, log.Warn); err != nil {
344 log.Warn("web UI", "listen", cfg.UIListen, "err", err)
345 } else {
346 log.Info("web UI", "url", "http://"+cfg.UIListen, "first_start", created, "token", "see: bluegit-runner ui-token")
347 }
348 }
349 }
242 go func() {
350 go func() {
243 t := time.NewTicker(30 * time.Second)
351 t := time.NewTicker(30 * time.Second)
244 defer t.Stop()
352 defer t.Stop()
@@ -247,18 +355,27 @@ func cmdRun(args []string) error {
247 case <-ctx.Done():
355 case <-ctx.Done():
248 return
356 return
249 case <-t.C:
357 case <-t.C:
250 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil && ctx.Err() == nil {
358 if err := c.heartbeat(ctx); err != nil && ctx.Err() == nil {
251 log.Warn("heartbeat", "err", err)
359 log.Warn("heartbeat", "err", err)
252 }
360 }
253 }
361 }
254 }
362 }
255 }()
363 }()
256 var wg sync.WaitGroup
364 var wg sync.WaitGroup
257 for i := 0; i < cfg.Concurrency; i++ {
365 // Een vaste pool; worker i werkt alleen als i < concurrency en niet gepauzeerd.
366 for i := 0; i < maxWorkers; i++ {
258 wg.Add(1)
367 wg.Add(1)
259 go func() {
368 go func(i int) {
260 defer wg.Done()
369 defer wg.Done()
261 for ctx.Err() == nil {
370 for ctx.Err() == nil {
371 s := c.settings()
372 if s.Paused || i >= s.Concurrency {
373 select {
374 case <-ctx.Done():
375 case <-time.After(2 * time.Second):
376 }
377 continue
378 }
262 ran, err := c.poll(ctx)
379 ran, err := c.poll(ctx)
263 if err != nil && ctx.Err() == nil {
380 if err != nil && ctx.Err() == nil {
264 log.Warn("poll", "err", err)
381 log.Warn("poll", "err", err)
@@ -271,7 +388,7 @@ func cmdRun(args []string) error {
271 stop()
388 stop()
272 }
389 }
273 }
390 }
274 }()
391 }(i)
275 }
392 }
276 wg.Wait()
393 wg.Wait()
277 return nil
394 return nil
@@ -326,6 +443,9 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
326 ctx, cancel := context.WithCancel(parent)
443 ctx, cancel := context.WithCancel(parent)
327 defer cancel()
444 defer cancel()
328 runCtx := ctx
445 runCtx := ctx
446 if m := c.settings().JobTimeoutMin; m > 0 && (pl.Timeout <= 0 || int64(m*60) < pl.Timeout) {
447 pl.Timeout = int64(m * 60)
448 }
329 if pl.Timeout > 0 {
449 if pl.Timeout > 0 {
330 var tc context.CancelFunc
450 var tc context.CancelFunc
331 runCtx, tc = context.WithTimeout(ctx, time.Duration(pl.Timeout)*time.Second)
451 runCtx, tc = context.WithTimeout(ctx, time.Duration(pl.Timeout)*time.Second)
@@ -385,9 +505,20 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
385 }
505 }
386 }
506 }
387 }()
507 }()
388 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.cfg.Name}
508 st := c.settings()
509 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.status().Name}
510 if over, oerr := st.Overrides(c.cfg.WorkDir, nil); oerr == nil {
511 r.Configure(st, over)
512 }
513 c.jobs.Start(runnercfg.JobInfo{ID: pl.JobID, Name: pl.Job.Name, Pipeline: pl.PipelineID, Image: pl.Job.Image,
514 Project: pl.Env["CI_PROJECT_PATH"], URL: pl.Env["CI_JOB_URL"]})
389 work := filepath.Join(c.cfg.WorkDir, "work", strconv.FormatInt(pl.JobID, 10))
515 work := filepath.Join(c.cfg.WorkDir, "work", strconv.FormatInt(pl.JobID, 10))
390 defer os.RemoveAll(work)
516 defer func() {
517 if st.CleanupWork {
518 _ = os.RemoveAll(work)
519 }
520 runnercfg.Cleanup(context.Background(), c.cfg.Docker, c.settings(), c.jobs, filepath.Join(c.cfg.WorkDir, "cache"))
521 }()
391 clone := func(ctx context.Context, dir string) error {
522 clone := func(ctx context.Context, dir string) error {
392 cmd := exec.CommandContext(ctx, c.cfg.Git, "clone", "--quiet", pl.CloneURL, dir)
523 cmd := exec.CommandContext(ctx, c.cfg.Git, "clone", "--quiet", pl.CloneURL, dir)
393 // Het runner-token via de omgeving, niet in de proceslijst.
524 // Het runner-token via de omgeving, niet in de proceslijst.
@@ -435,6 +566,7 @@ func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
435 if ferr := c.postJSON(fctx, base+"/finish", map[string]string{"status": status, "message": msg}, nil); ferr != nil {
566 if ferr := c.postJSON(fctx, base+"/finish", map[string]string{"status": status, "message": msg}, nil); ferr != nil {
436 c.log.Error("finish", "job", pl.JobID, "err", ferr)
567 c.log.Error("finish", "job", pl.JobID, "err", ferr)
437 }
568 }
569 c.jobs.Finish(pl.JobID, status)
438 c.log.Info("job done", "id", pl.JobID, "status", status)
570 c.log.Info("job done", "id", pl.JobID, "status", status)
439}
571}
440
572
cmd/bluegit-runner/ui.go added +280 −0
@@ -0,0 +1,280 @@
1 package main
2
3 import (
4 "bytes"
5 "context"
6 "crypto/hmac"
7 "crypto/rand"
8 "crypto/sha256"
9 "crypto/subtle"
10 "encoding/hex"
11 "errors"
12 "html/template"
13 "net"
14 "net/http"
15 "os"
16 "path/filepath"
17 "strings"
18 "time"
19
20 "gitlab.com/Timfa/bluegit/internal/i18n"
21 "gitlab.com/Timfa/bluegit/internal/runnercfg"
22 "gitlab.com/Timfa/bluegit/internal/server/static"
23 )
24
25 // De webinterface van de runner. Standaard alleen op 127.0.0.1:8765
26 // (ui_listen); "off" zet hem uit. Toegang met een beheertoken dat lokaal
27 // in work_dir/ui-token staat (0600). Het token komt nooit in de logs;
28 // `bluegit-runner ui-token` toont het op de machine zelf.
29
30 const defaultUIListen = "127.0.0.1:8765"
31
32 func uiTokenPath(cfg Config) string { return filepath.Join(cfg.WorkDir, "ui-token") }
33
34 // ensureUIToken maakt het token bij de eerste start.
35 func ensureUIToken(cfg Config) (string, bool, error) {
36 p := uiTokenPath(cfg)
37 if b, err := os.ReadFile(p); err == nil && len(bytes.TrimSpace(b)) >= 32 {
38 return string(bytes.TrimSpace(b)), false, nil
39 }
40 raw := make([]byte, 24)
41 if _, err := rand.Read(raw); err != nil {
42 return "", false, err
43 }
44 tok := "bgru_" + hex.EncodeToString(raw)
45 if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
46 return "", false, err
47 }
48 if err := os.WriteFile(p, []byte(tok+"\n"), 0o600); err != nil {
49 return "", false, err
50 }
51 return tok, true, nil
52 }
53
54 type webUI struct {
55 cfg Config
56 token string
57 h *runnercfg.Handler
58 mux *http.ServeMux
59 }
60
61 func (u *webUI) mac(purpose string) string {
62 m := hmac.New(sha256.New, []byte(u.token))
63 m.Write([]byte(purpose))
64 return hex.EncodeToString(m.Sum(nil))
65 }
66
67 func (u *webUI) authed(r *http.Request) bool {
68 if a := r.Header.Get("Authorization"); strings.HasPrefix(a, "Bearer ") {
69 return subtle.ConstantTimeCompare([]byte(strings.TrimPrefix(a, "Bearer ")), []byte(u.token)) == 1
70 }
71 c, err := r.Cookie("bgru_session")
72 return err == nil && subtle.ConstantTimeCompare([]byte(c.Value), []byte(u.mac("session"))) == 1
73 }
74
75 func (u *webUI) lang(r *http.Request) i18n.Lang {
76 if q := r.URL.Query().Get("lang"); q != "" {
77 return i18n.Parse(q)
78 }
79 if c, err := r.Cookie("lang"); err == nil {
80 return i18n.Parse(c.Value)
81 }
82 if u.cfg.Language != "" {
83 return i18n.Parse(u.cfg.Language)
84 }
85 al := strings.ToLower(r.Header.Get("Accept-Language"))
86 for _, l := range []i18n.Lang{i18n.NL, i18n.DE, i18n.FR, i18n.EN} {
87 if strings.HasPrefix(al, string(l)) {
88 return l
89 }
90 }
91 return i18n.EN
92 }
93
94 func newWebUI(cfg Config, token string, h *runnercfg.Handler) *webUI {
95 u := &webUI{cfg: cfg, token: token, h: h, mux: http.NewServeMux()}
96 h.Lang = u.lang
97 h.Auth = func(w http.ResponseWriter, r *http.Request, write bool) bool {
98 if u.authed(r) {
99 return true
100 }
101 if strings.HasPrefix(r.URL.Path, "/api/") {
102 w.Header().Set("Content-Type", "application/json")
103 w.WriteHeader(http.StatusUnauthorized)
104 _, _ = w.Write([]byte(`{"error":"unauthorized"}` + "\n"))
105 return false
106 }
107 http.Redirect(w, r, "/login", http.StatusSeeOther)
108 return false
109 }
110 h.CSRF = func(r *http.Request) (string, string) { return "csrf", u.mac("csrf") }
111 h.CheckCSRF = func(r *http.Request) bool {
112 if strings.HasPrefix(r.Header.Get("Authorization"), "Bearer ") {
113 return true
114 }
115 return hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf")))
116 }
117 h.Layout = u.layout
118 h.DocsURL = "/docs"
119 h.Mount(u.mux, true)
120 u.mux.HandleFunc("GET /assets/style.css", func(w http.ResponseWriter, r *http.Request) {
121 w.Header().Set("Content-Type", "text/css; charset=utf-8")
122 _, _ = w.Write(static.StyleCSS)
123 })
124 u.mux.HandleFunc("GET /assets/logo.svg", func(w http.ResponseWriter, r *http.Request) {
125 w.Header().Set("Content-Type", "image/svg+xml")
126 _, _ = w.Write(static.LogoSVG)
127 })
128 u.mux.HandleFunc("GET /docs", u.docs)
129 u.mux.HandleFunc("GET /login", u.loginPage)
130 u.mux.HandleFunc("POST /login", u.login)
131 u.mux.HandleFunc("POST /logout", u.logout)
132 u.mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("ok\n")) })
133 return u
134 }
135
136 func (u *webUI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
137 w.Header().Set("X-Frame-Options", "DENY")
138 w.Header().Set("X-Content-Type-Options", "nosniff")
139 w.Header().Set("Referrer-Policy", "same-origin")
140 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self' 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'")
141 if q := r.URL.Query().Get("lang"); q != "" && r.Method == http.MethodGet {
142 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(i18n.Parse(q)), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode})
143 }
144 u.mux.ServeHTTP(w, r)
145 }
146
147 func (u *webUI) loginPage(w http.ResponseWriter, r *http.Request) {
148 lang := u.lang(r)
149 var b bytes.Buffer
150 _ = loginTmpl.Execute(&b, map[string]any{"Lang": lang, "Bad": r.URL.Query().Get("bad") != "", "T": tfunc(lang)})
151 u.layout(w, r, lang, i18n.T(lang, "rui.login"), template.HTML(b.String()))
152 }
153
154 func tfunc(lang i18n.Lang) func(string, ...any) string {
155 return func(k string, a ...any) string { return i18n.T(lang, k, a...) }
156 }
157
158 func (u *webUI) login(w http.ResponseWriter, r *http.Request) {
159 tok := strings.TrimSpace(r.FormValue("token"))
160 if subtle.ConstantTimeCompare([]byte(tok), []byte(u.token)) != 1 {
161 time.Sleep(500 * time.Millisecond)
162 http.Redirect(w, r, "/login?bad=1", http.StatusSeeOther)
163 return
164 }
165 http.SetCookie(w, &http.Cookie{Name: "bgru_session", Value: u.mac("session"), Path: "/", HttpOnly: true, SameSite: http.SameSiteStrictMode, Secure: r.TLS != nil, MaxAge: 30 * 86400})
166 http.Redirect(w, r, "/", http.StatusSeeOther)
167 }
168
169 func (u *webUI) logout(w http.ResponseWriter, r *http.Request) {
170 if !hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf"))) {
171 http.Error(w, "csrf", http.StatusForbidden)
172 return
173 }
174 http.SetCookie(w, &http.Cookie{Name: "bgru_session", Value: "", Path: "/", MaxAge: -1})
175 http.Redirect(w, r, "/login", http.StatusSeeOther)
176 }
177
178 func (u *webUI) docs(w http.ResponseWriter, r *http.Request) {
179 lang := u.lang(r)
180 var b bytes.Buffer
181 _ = docsTmpl.Execute(&b, map[string]any{"T": tfunc(lang), "Sections": docSections, "Listen": u.cfg.UIListen, "Server": u.cfg.URL})
182 u.layout(w, r, lang, i18n.T(lang, "rdoc.title"), template.HTML(b.String()))
183 }
184
185 func (u *webUI) layout(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
186 w.Header().Set("Content-Type", "text/html; charset=utf-8")
187 w.Header().Set("Cache-Control", "no-store")
188 path := r.URL.Path
189 langs := []map[string]any{}
190 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
191 langs = append(langs, map[string]any{"Code": string(l), "Name": l.Name(), "On": l == lang})
192 }
193 _ = layoutTmpl.Execute(w, map[string]any{
194 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "Langs": langs, "Path": path,
195 "Authed": u.authed(r), "CSRF": u.mac("csrf"),
196 })
197 }
198
199 // serveUI start de webinterface; fouten komen in de log, niet fataal.
200 func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...any)) error {
201 ln, err := net.Listen("tcp", listen)
202 if err != nil {
203 return err
204 }
205 srv := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
206 go func() {
207 <-ctx.Done()
208 sc, cancel := context.WithTimeout(context.Background(), 5*time.Second)
209 defer cancel()
210 _ = srv.Shutdown(sc)
211 }()
212 go func() {
213 if err := srv.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
214 logf("web UI", "err", err)
215 }
216 }()
217 return nil
218 }
219
220 var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
221 <html lang="{{.Lang}}">
222 <head>
223 <meta charset="utf-8">
224 <meta name="viewport" content="width=device-width, initial-scale=1">
225 <title>{{.Title}} · BlueGit runner</title>
226 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
227 <link rel="stylesheet" href="/assets/style.css">
228 </head>
229 <body>
230 <header class="top">
231 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> {{call .T "rui.brand"}}</a>
232 <nav class="rui-nav">
233 {{if .Authed}}<a href="/">{{call .T "rui.nav.overview"}}</a>{{end}}
234 <a href="/docs">{{call .T "rui.nav.docs"}}</a>
235 <span class="rui-langs">{{range .Langs}}<a href="{{$.Path}}?lang={{.Code}}" title="{{.Name}}"{{if .On}} class="on"{{end}}>{{.Code}}</a>{{end}}</span>
236 {{if .Authed}}<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{call .T "rui.nav.logout"}}</button></form>{{end}}
237 </nav>
238 </header>
239 <div class="frame"><div class="content"><main class="wide">
240 {{.Body}}
241 </main></div></div>
242 <script>
243 document.addEventListener('submit', function (e) {
244 var f = e.target, q = f.getAttribute('data-confirm');
245 if (q && !window.confirm(q)) { e.preventDefault(); }
246 });
247 </script>
248 </body>
249 </html>`))
250
251 var loginTmpl = template.Must(template.New("login").Parse(`<section class="panel rui-login">
252 <h1>{{call .T "rui.login"}}</h1>
253 <p class="muted">{{call .T "rui.loginLead"}}</p>
254 <pre class="code">sudo bluegit-runner ui-token</pre>
255 {{if .Bad}}<p class="flash bad">{{call .T "rui.loginBad"}}</p>{{end}}
256 <form method="post" action="/login">
257 <label>{{call .T "rui.token"}}<input type="password" name="token" autocomplete="current-password" required autofocus></label>
258 <button type="submit">{{call .T "rui.loginBtn"}}</button>
259 </form>
260 </section>`))
261
262 // docSections zijn de koppen van de docs-pagina op de runner; tekst uit de catalogus.
263 var docSections = []string{"intro", "network", "ui", "settings", "presets", "pause", "upgrade", "api", "trouble"}
264
265 var docsTmpl = template.Must(template.New("docs").Parse(`<article class="panel rui-doc readme">
266 <div class="mdbody">
267 <h1>{{call .T "rdoc.title"}}</h1>
268 {{range .Sections}}
269 <h2 id="{{.}}">{{call $.T (printf "rdoc.%s.h" .)}}</h2>
270 <p>{{call $.T (printf "rdoc.%s.p" .)}}</p>
271 {{end}}
272 <h2 id="commands">{{call .T "rdoc.cmd.h"}}</h2>
273 <pre><code>sudo bluegit-runner ui-token
274 journalctl -u bluegit-runner -f
275 sudo -u bluegit-runner docker info
276 curl -H "Authorization: Bearer $(sudo cat /var/lib/bluegit-runner/ui-token)" http://{{.Listen}}/api/status
277 curl -X POST -H "Authorization: Bearer …" http://{{.Listen}}/api/pause</code></pre>
278 <p>{{call .T "rdoc.more"}} <a href="{{.Server}}/help/runners">{{.Server}}/help/runners</a></p>
279 </div>
280 </article>`))
@@ -0,0 +1,280 @@
1package main
2
3import (
4 "bytes"
5 "context"
6 "crypto/hmac"
7 "crypto/rand"
8 "crypto/sha256"
9 "crypto/subtle"
10 "encoding/hex"
11 "errors"
12 "html/template"
13 "net"
14 "net/http"
15 "os"
16 "path/filepath"
17 "strings"
18 "time"
19
20 "gitlab.com/Timfa/bluegit/internal/i18n"
21 "gitlab.com/Timfa/bluegit/internal/runnercfg"
22 "gitlab.com/Timfa/bluegit/internal/server/static"
23)
24
25// De webinterface van de runner. Standaard alleen op 127.0.0.1:8765
26// (ui_listen); "off" zet hem uit. Toegang met een beheertoken dat lokaal
27// in work_dir/ui-token staat (0600). Het token komt nooit in de logs;
28// `bluegit-runner ui-token` toont het op de machine zelf.
29
30const defaultUIListen = "127.0.0.1:8765"
31
32func uiTokenPath(cfg Config) string { return filepath.Join(cfg.WorkDir, "ui-token") }
33
34// ensureUIToken maakt het token bij de eerste start.
35func ensureUIToken(cfg Config) (string, bool, error) {
36 p := uiTokenPath(cfg)
37 if b, err := os.ReadFile(p); err == nil && len(bytes.TrimSpace(b)) >= 32 {
38 return string(bytes.TrimSpace(b)), false, nil
39 }
40 raw := make([]byte, 24)
41 if _, err := rand.Read(raw); err != nil {
42 return "", false, err
43 }
44 tok := "bgru_" + hex.EncodeToString(raw)
45 if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
46 return "", false, err
47 }
48 if err := os.WriteFile(p, []byte(tok+"\n"), 0o600); err != nil {
49 return "", false, err
50 }
51 return tok, true, nil
52}
53
54type webUI struct {
55 cfg Config
56 token string
57 h *runnercfg.Handler
58 mux *http.ServeMux
59}
60
61func (u *webUI) mac(purpose string) string {
62 m := hmac.New(sha256.New, []byte(u.token))
63 m.Write([]byte(purpose))
64 return hex.EncodeToString(m.Sum(nil))
65}
66
67func (u *webUI) authed(r *http.Request) bool {
68 if a := r.Header.Get("Authorization"); strings.HasPrefix(a, "Bearer ") {
69 return subtle.ConstantTimeCompare([]byte(strings.TrimPrefix(a, "Bearer ")), []byte(u.token)) == 1
70 }
71 c, err := r.Cookie("bgru_session")
72 return err == nil && subtle.ConstantTimeCompare([]byte(c.Value), []byte(u.mac("session"))) == 1
73}
74
75func (u *webUI) lang(r *http.Request) i18n.Lang {
76 if q := r.URL.Query().Get("lang"); q != "" {
77 return i18n.Parse(q)
78 }
79 if c, err := r.Cookie("lang"); err == nil {
80 return i18n.Parse(c.Value)
81 }
82 if u.cfg.Language != "" {
83 return i18n.Parse(u.cfg.Language)
84 }
85 al := strings.ToLower(r.Header.Get("Accept-Language"))
86 for _, l := range []i18n.Lang{i18n.NL, i18n.DE, i18n.FR, i18n.EN} {
87 if strings.HasPrefix(al, string(l)) {
88 return l
89 }
90 }
91 return i18n.EN
92}
93
94func newWebUI(cfg Config, token string, h *runnercfg.Handler) *webUI {
95 u := &webUI{cfg: cfg, token: token, h: h, mux: http.NewServeMux()}
96 h.Lang = u.lang
97 h.Auth = func(w http.ResponseWriter, r *http.Request, write bool) bool {
98 if u.authed(r) {
99 return true
100 }
101 if strings.HasPrefix(r.URL.Path, "/api/") {
102 w.Header().Set("Content-Type", "application/json")
103 w.WriteHeader(http.StatusUnauthorized)
104 _, _ = w.Write([]byte(`{"error":"unauthorized"}` + "\n"))
105 return false
106 }
107 http.Redirect(w, r, "/login", http.StatusSeeOther)
108 return false
109 }
110 h.CSRF = func(r *http.Request) (string, string) { return "csrf", u.mac("csrf") }
111 h.CheckCSRF = func(r *http.Request) bool {
112 if strings.HasPrefix(r.Header.Get("Authorization"), "Bearer ") {
113 return true
114 }
115 return hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf")))
116 }
117 h.Layout = u.layout
118 h.DocsURL = "/docs"
119 h.Mount(u.mux, true)
120 u.mux.HandleFunc("GET /assets/style.css", func(w http.ResponseWriter, r *http.Request) {
121 w.Header().Set("Content-Type", "text/css; charset=utf-8")
122 _, _ = w.Write(static.StyleCSS)
123 })
124 u.mux.HandleFunc("GET /assets/logo.svg", func(w http.ResponseWriter, r *http.Request) {
125 w.Header().Set("Content-Type", "image/svg+xml")
126 _, _ = w.Write(static.LogoSVG)
127 })
128 u.mux.HandleFunc("GET /docs", u.docs)
129 u.mux.HandleFunc("GET /login", u.loginPage)
130 u.mux.HandleFunc("POST /login", u.login)
131 u.mux.HandleFunc("POST /logout", u.logout)
132 u.mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("ok\n")) })
133 return u
134}
135
136func (u *webUI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
137 w.Header().Set("X-Frame-Options", "DENY")
138 w.Header().Set("X-Content-Type-Options", "nosniff")
139 w.Header().Set("Referrer-Policy", "same-origin")
140 w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' data:; style-src 'self'; script-src 'self' 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'")
141 if q := r.URL.Query().Get("lang"); q != "" && r.Method == http.MethodGet {
142 http.SetCookie(w, &http.Cookie{Name: "lang", Value: string(i18n.Parse(q)), Path: "/", MaxAge: 365 * 86400, SameSite: http.SameSiteStrictMode})
143 }
144 u.mux.ServeHTTP(w, r)
145}
146
147func (u *webUI) loginPage(w http.ResponseWriter, r *http.Request) {
148 lang := u.lang(r)
149 var b bytes.Buffer
150 _ = loginTmpl.Execute(&b, map[string]any{"Lang": lang, "Bad": r.URL.Query().Get("bad") != "", "T": tfunc(lang)})
151 u.layout(w, r, lang, i18n.T(lang, "rui.login"), template.HTML(b.String()))
152}
153
154func tfunc(lang i18n.Lang) func(string, ...any) string {
155 return func(k string, a ...any) string { return i18n.T(lang, k, a...) }
156}
157
158func (u *webUI) login(w http.ResponseWriter, r *http.Request) {
159 tok := strings.TrimSpace(r.FormValue("token"))
160 if subtle.ConstantTimeCompare([]byte(tok), []byte(u.token)) != 1 {
161 time.Sleep(500 * time.Millisecond)
162 http.Redirect(w, r, "/login?bad=1", http.StatusSeeOther)
163 return
164 }
165 http.SetCookie(w, &http.Cookie{Name: "bgru_session", Value: u.mac("session"), Path: "/", HttpOnly: true, SameSite: http.SameSiteStrictMode, Secure: r.TLS != nil, MaxAge: 30 * 86400})
166 http.Redirect(w, r, "/", http.StatusSeeOther)
167}
168
169func (u *webUI) logout(w http.ResponseWriter, r *http.Request) {
170 if !hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf"))) {
171 http.Error(w, "csrf", http.StatusForbidden)
172 return
173 }
174 http.SetCookie(w, &http.Cookie{Name: "bgru_session", Value: "", Path: "/", MaxAge: -1})
175 http.Redirect(w, r, "/login", http.StatusSeeOther)
176}
177
178func (u *webUI) docs(w http.ResponseWriter, r *http.Request) {
179 lang := u.lang(r)
180 var b bytes.Buffer
181 _ = docsTmpl.Execute(&b, map[string]any{"T": tfunc(lang), "Sections": docSections, "Listen": u.cfg.UIListen, "Server": u.cfg.URL})
182 u.layout(w, r, lang, i18n.T(lang, "rdoc.title"), template.HTML(b.String()))
183}
184
185func (u *webUI) layout(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
186 w.Header().Set("Content-Type", "text/html; charset=utf-8")
187 w.Header().Set("Cache-Control", "no-store")
188 path := r.URL.Path
189 langs := []map[string]any{}
190 for _, l := range []i18n.Lang{i18n.EN, i18n.NL, i18n.DE, i18n.FR} {
191 langs = append(langs, map[string]any{"Code": string(l), "Name": l.Name(), "On": l == lang})
192 }
193 _ = layoutTmpl.Execute(w, map[string]any{
194 "Title": title, "Body": body, "T": tfunc(lang), "Lang": string(lang), "Langs": langs, "Path": path,
195 "Authed": u.authed(r), "CSRF": u.mac("csrf"),
196 })
197}
198
199// serveUI start de webinterface; fouten komen in de log, niet fataal.
200func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...any)) error {
201 ln, err := net.Listen("tcp", listen)
202 if err != nil {
203 return err
204 }
205 srv := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
206 go func() {
207 <-ctx.Done()
208 sc, cancel := context.WithTimeout(context.Background(), 5*time.Second)
209 defer cancel()
210 _ = srv.Shutdown(sc)
211 }()
212 go func() {
213 if err := srv.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
214 logf("web UI", "err", err)
215 }
216 }()
217 return nil
218}
219
220var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
221<html lang="{{.Lang}}">
222<head>
223 <meta charset="utf-8">
224 <meta name="viewport" content="width=device-width, initial-scale=1">
225 <title>{{.Title}} · BlueGit runner</title>
226 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
227 <link rel="stylesheet" href="/assets/style.css">
228</head>
229<body>
230<header class="top">
231 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> {{call .T "rui.brand"}}</a>
232 <nav class="rui-nav">
233 {{if .Authed}}<a href="/">{{call .T "rui.nav.overview"}}</a>{{end}}
234 <a href="/docs">{{call .T "rui.nav.docs"}}</a>
235 <span class="rui-langs">{{range .Langs}}<a href="{{$.Path}}?lang={{.Code}}" title="{{.Name}}"{{if .On}} class="on"{{end}}>{{.Code}}</a>{{end}}</span>
236 {{if .Authed}}<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{call .T "rui.nav.logout"}}</button></form>{{end}}
237 </nav>
238</header>
239<div class="frame"><div class="content"><main class="wide">
240{{.Body}}
241</main></div></div>
242<script>
243document.addEventListener('submit', function (e) {
244 var f = e.target, q = f.getAttribute('data-confirm');
245 if (q && !window.confirm(q)) { e.preventDefault(); }
246});
247</script>
248</body>
249</html>`))
250
251var loginTmpl = template.Must(template.New("login").Parse(`<section class="panel rui-login">
252 <h1>{{call .T "rui.login"}}</h1>
253 <p class="muted">{{call .T "rui.loginLead"}}</p>
254 <pre class="code">sudo bluegit-runner ui-token</pre>
255 {{if .Bad}}<p class="flash bad">{{call .T "rui.loginBad"}}</p>{{end}}
256 <form method="post" action="/login">
257 <label>{{call .T "rui.token"}}<input type="password" name="token" autocomplete="current-password" required autofocus></label>
258 <button type="submit">{{call .T "rui.loginBtn"}}</button>
259 </form>
260</section>`))
261
262// docSections zijn de koppen van de docs-pagina op de runner; tekst uit de catalogus.
263var docSections = []string{"intro", "network", "ui", "settings", "presets", "pause", "upgrade", "api", "trouble"}
264
265var docsTmpl = template.Must(template.New("docs").Parse(`<article class="panel rui-doc readme">
266<div class="mdbody">
267 <h1>{{call .T "rdoc.title"}}</h1>
268 {{range .Sections}}
269 <h2 id="{{.}}">{{call $.T (printf "rdoc.%s.h" .)}}</h2>
270 <p>{{call $.T (printf "rdoc.%s.p" .)}}</p>
271 {{end}}
272 <h2 id="commands">{{call .T "rdoc.cmd.h"}}</h2>
273 <pre><code>sudo bluegit-runner ui-token
274journalctl -u bluegit-runner -f
275sudo -u bluegit-runner docker info
276curl -H "Authorization: Bearer $(sudo cat /var/lib/bluegit-runner/ui-token)" http://{{.Listen}}/api/status
277curl -X POST -H "Authorization: Bearer …" http://{{.Listen}}/api/pause</code></pre>
278 <p>{{call .T "rdoc.more"}} <a href="{{.Server}}/help/runners">{{.Server}}/help/runners</a></p>
279</div>
280</article>`))
cmd/bluegit-runner/ui_test.go added +127 −0
@@ -0,0 +1,127 @@
1 package main
2
3 import (
4 "io"
5 "net/http"
6 "net/http/httptest"
7 "net/url"
8 "os"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/runnercfg"
14 )
15
16 func testUI(t *testing.T) (*webUI, *runnercfg.Handler, string) {
17 t.Helper()
18 cfg := Config{URL: "https://git.example.com", Token: "bgr_x", WorkDir: t.TempDir()}
19 cfg.defaults()
20 tok, created, err := ensureUIToken(cfg)
21 if err != nil || !created || !strings.HasPrefix(tok, "bgru_") {
22 t.Fatalf("%v %v %q", err, created, tok)
23 }
24 if fi, _ := os.Stat(uiTokenPath(cfg)); fi.Mode().Perm() != 0o600 {
25 t.Fatalf("mode %v", fi.Mode())
26 }
27 again, created2, _ := ensureUIToken(cfg)
28 if again != tok || created2 {
29 t.Fatal("token blijft hetzelfde")
30 }
31 h := &runnercfg.Handler{File: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, Default: runnercfg.Defaults(),
32 Tracker: &runnercfg.Tracker{}, WorkDir: cfg.WorkDir, Status: func() runnercfg.Status { return runnercfg.Status{Kind: "standalone", Name: "pc"} }}
33 return newWebUI(cfg, tok, h), h, tok
34 }
35
36 func TestWebUIAuth(t *testing.T) {
37 u, h, tok := testUI(t)
38 srv := httptest.NewServer(u)
39 defer srv.Close()
40 noRedirect := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
41 res, _ := noRedirect.Get(srv.URL + "/")
42 if res.StatusCode != http.StatusSeeOther || res.Header.Get("Location") != "/login" {
43 t.Fatalf("zonder login: %d", res.StatusCode)
44 }
45 res, _ = http.Get(srv.URL + "/api/status")
46 if res.StatusCode != http.StatusUnauthorized {
47 t.Fatalf("api zonder token: %d", res.StatusCode)
48 }
49 res, _ = noRedirect.PostForm(srv.URL+"/pause", url.Values{})
50 if res.StatusCode != http.StatusSeeOther || h.Current().Paused {
51 t.Fatal("pauze zonder login")
52 }
53 res, _ = noRedirect.PostForm(srv.URL+"/login", url.Values{"token": {"bgru_fout"}})
54 if !strings.Contains(res.Header.Get("Location"), "bad=1") {
55 t.Fatal("fout token")
56 }
57 res, _ = noRedirect.PostForm(srv.URL+"/login", url.Values{"token": {tok}})
58 var sess *http.Cookie
59 for _, c := range res.Cookies() {
60 if c.Name == "bgru_session" {
61 sess = c
62 }
63 }
64 if sess == nil || !sess.HttpOnly || sess.SameSite != http.SameSiteStrictMode || strings.Contains(sess.Value, tok) {
65 t.Fatalf("cookie %+v", sess)
66 }
67 get := func(p string) (int, string) {
68 req, _ := http.NewRequest("GET", srv.URL+p, nil)
69 req.AddCookie(sess)
70 r, err := noRedirect.Do(req)
71 if err != nil {
72 t.Fatal(err)
73 }
74 defer r.Body.Close()
75 b, _ := io.ReadAll(r.Body)
76 return r.StatusCode, string(b)
77 }
78 code, page := get("/")
79 if code != 200 || !strings.Contains(page, "/assets/style.css") || !strings.Contains(page, `class="rui"`) || strings.Contains(page, tok) {
80 t.Fatalf("pagina %d", code)
81 }
82 // CSRF verplicht bij een formulier met cookie.
83 form := func(p string, v url.Values) int {
84 req, _ := http.NewRequest("POST", srv.URL+p, strings.NewReader(v.Encode()))
85 req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
86 req.AddCookie(sess)
87 r, _ := noRedirect.Do(req)
88 r.Body.Close()
89 return r.StatusCode
90 }
91 if form("/pause", url.Values{"csrf": {"x"}}) != http.StatusForbidden || h.Current().Paused {
92 t.Fatal("csrf")
93 }
94 if form("/settings", url.Values{"csrf": {u.mac("csrf")}, "name": {"nieuwe naam"}, "concurrency": {"2"}, "max_images": {"5"}}) != http.StatusSeeOther || h.Current().Name != "nieuwe naam" {
95 t.Fatal("naam opslaan")
96 }
97 // Bearer-token voor de API.
98 req, _ := http.NewRequest("POST", srv.URL+"/api/pause", nil)
99 req.Header.Set("Authorization", "Bearer "+tok)
100 res, _ = http.DefaultClient.Do(req)
101 if res.StatusCode != 200 || !h.Current().Paused || !h.Tracker.Paused() {
102 t.Fatalf("api pauze %d", res.StatusCode)
103 }
104 // Docs en login in alle talen, zonder onvertaalde sleutels.
105 for _, l := range []string{"en", "nl", "de", "fr"} {
106 for _, p := range []string{"/docs", "/login", "/"} {
107 code, page := get(p + "?lang=" + l)
108 if code != 200 || strings.Contains(page, "rdoc.") || strings.Contains(page, "rui.") || !strings.Contains(page, `lang="`+l+`"`) {
109 t.Fatalf("%s %s: %d", l, p, code)
110 }
111 }
112 }
113 if code, page := get("/docs?lang=nl"); code != 200 || !strings.Contains(page, "443") {
114 t.Fatal("docs noemen netwerk")
115 }
116 if res, _ := http.Get(srv.URL + "/assets/style.css"); res.StatusCode != 200 || res.Header.Get("Content-Type") != "text/css; charset=utf-8" {
117 t.Fatal("css")
118 }
119 }
120
121 func TestConfigDefaultsUI(t *testing.T) {
122 c := Config{}
123 c.defaults()
124 if c.UIListen != "127.0.0.1:8765" {
125 t.Fatal(c.UIListen)
126 }
127 }
@@ -0,0 +1,127 @@
1package main
2
3import (
4 "io"
5 "net/http"
6 "net/http/httptest"
7 "net/url"
8 "os"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/runnercfg"
14)
15
16func testUI(t *testing.T) (*webUI, *runnercfg.Handler, string) {
17 t.Helper()
18 cfg := Config{URL: "https://git.example.com", Token: "bgr_x", WorkDir: t.TempDir()}
19 cfg.defaults()
20 tok, created, err := ensureUIToken(cfg)
21 if err != nil || !created || !strings.HasPrefix(tok, "bgru_") {
22 t.Fatalf("%v %v %q", err, created, tok)
23 }
24 if fi, _ := os.Stat(uiTokenPath(cfg)); fi.Mode().Perm() != 0o600 {
25 t.Fatalf("mode %v", fi.Mode())
26 }
27 again, created2, _ := ensureUIToken(cfg)
28 if again != tok || created2 {
29 t.Fatal("token blijft hetzelfde")
30 }
31 h := &runnercfg.Handler{File: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, Default: runnercfg.Defaults(),
32 Tracker: &runnercfg.Tracker{}, WorkDir: cfg.WorkDir, Status: func() runnercfg.Status { return runnercfg.Status{Kind: "standalone", Name: "pc"} }}
33 return newWebUI(cfg, tok, h), h, tok
34}
35
36func TestWebUIAuth(t *testing.T) {
37 u, h, tok := testUI(t)
38 srv := httptest.NewServer(u)
39 defer srv.Close()
40 noRedirect := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
41 res, _ := noRedirect.Get(srv.URL + "/")
42 if res.StatusCode != http.StatusSeeOther || res.Header.Get("Location") != "/login" {
43 t.Fatalf("zonder login: %d", res.StatusCode)
44 }
45 res, _ = http.Get(srv.URL + "/api/status")
46 if res.StatusCode != http.StatusUnauthorized {
47 t.Fatalf("api zonder token: %d", res.StatusCode)
48 }
49 res, _ = noRedirect.PostForm(srv.URL+"/pause", url.Values{})
50 if res.StatusCode != http.StatusSeeOther || h.Current().Paused {
51 t.Fatal("pauze zonder login")
52 }
53 res, _ = noRedirect.PostForm(srv.URL+"/login", url.Values{"token": {"bgru_fout"}})
54 if !strings.Contains(res.Header.Get("Location"), "bad=1") {
55 t.Fatal("fout token")
56 }
57 res, _ = noRedirect.PostForm(srv.URL+"/login", url.Values{"token": {tok}})
58 var sess *http.Cookie
59 for _, c := range res.Cookies() {
60 if c.Name == "bgru_session" {
61 sess = c
62 }
63 }
64 if sess == nil || !sess.HttpOnly || sess.SameSite != http.SameSiteStrictMode || strings.Contains(sess.Value, tok) {
65 t.Fatalf("cookie %+v", sess)
66 }
67 get := func(p string) (int, string) {
68 req, _ := http.NewRequest("GET", srv.URL+p, nil)
69 req.AddCookie(sess)
70 r, err := noRedirect.Do(req)
71 if err != nil {
72 t.Fatal(err)
73 }
74 defer r.Body.Close()
75 b, _ := io.ReadAll(r.Body)
76 return r.StatusCode, string(b)
77 }
78 code, page := get("/")
79 if code != 200 || !strings.Contains(page, "/assets/style.css") || !strings.Contains(page, `class="rui"`) || strings.Contains(page, tok) {
80 t.Fatalf("pagina %d", code)
81 }
82 // CSRF verplicht bij een formulier met cookie.
83 form := func(p string, v url.Values) int {
84 req, _ := http.NewRequest("POST", srv.URL+p, strings.NewReader(v.Encode()))
85 req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
86 req.AddCookie(sess)
87 r, _ := noRedirect.Do(req)
88 r.Body.Close()
89 return r.StatusCode
90 }
91 if form("/pause", url.Values{"csrf": {"x"}}) != http.StatusForbidden || h.Current().Paused {
92 t.Fatal("csrf")
93 }
94 if form("/settings", url.Values{"csrf": {u.mac("csrf")}, "name": {"nieuwe naam"}, "concurrency": {"2"}, "max_images": {"5"}}) != http.StatusSeeOther || h.Current().Name != "nieuwe naam" {
95 t.Fatal("naam opslaan")
96 }
97 // Bearer-token voor de API.
98 req, _ := http.NewRequest("POST", srv.URL+"/api/pause", nil)
99 req.Header.Set("Authorization", "Bearer "+tok)
100 res, _ = http.DefaultClient.Do(req)
101 if res.StatusCode != 200 || !h.Current().Paused || !h.Tracker.Paused() {
102 t.Fatalf("api pauze %d", res.StatusCode)
103 }
104 // Docs en login in alle talen, zonder onvertaalde sleutels.
105 for _, l := range []string{"en", "nl", "de", "fr"} {
106 for _, p := range []string{"/docs", "/login", "/"} {
107 code, page := get(p + "?lang=" + l)
108 if code != 200 || strings.Contains(page, "rdoc.") || strings.Contains(page, "rui.") || !strings.Contains(page, `lang="`+l+`"`) {
109 t.Fatalf("%s %s: %d", l, p, code)
110 }
111 }
112 }
113 if code, page := get("/docs?lang=nl"); code != 200 || !strings.Contains(page, "443") {
114 t.Fatal("docs noemen netwerk")
115 }
116 if res, _ := http.Get(srv.URL + "/assets/style.css"); res.StatusCode != 200 || res.Header.Get("Content-Type") != "text/css; charset=utf-8" {
117 t.Fatal("css")
118 }
119}
120
121func TestConfigDefaultsUI(t *testing.T) {
122 c := Config{}
123 c.defaults()
124 if c.UIListen != "127.0.0.1:8765" {
125 t.Fatal(c.UIListen)
126 }
127}
cmd/bluegit/main.go +4 −0
@@ -125,6 +125,10 @@ func serve(args []string) error {
125 125 }
126 126 rn.Hold = srv.HoldPipeline
127 127 srv.Runner = rn
128 if err := srv.ApplyRunnerSettings(); err != nil {
129 log.Error("runner-instellingen", "err", err)
130 }
131 go srv.RunnerMaintenance(ctx)
128 132 go rn.Loop(ctx, cfg.CI.Concurrency)
129 133 }
130 134 var sh *sshd.Server
@@ -125,6 +125,10 @@ func serve(args []string) error {
125 }
125 }
126 rn.Hold = srv.HoldPipeline
126 rn.Hold = srv.HoldPipeline
127 srv.Runner = rn
127 srv.Runner = rn
128 if err := srv.ApplyRunnerSettings(); err != nil {
129 log.Error("runner-instellingen", "err", err)
130 }
131 go srv.RunnerMaintenance(ctx)
128 go rn.Loop(ctx, cfg.CI.Concurrency)
132 go rn.Loop(ctx, cfg.CI.Concurrency)
129 }
133 }
130 var sh *sshd.Server
134 var sh *sshd.Server
docs/agents.md +13 −0
@@ -118,3 +118,16 @@ Het registratietoken is het enige geheim dat `bg` print, en alleen bij
118 118 `bg runner token`; geef het via `BLUEGIT_RUNNER_REGISTRATION_TOKEN` door
119 119 in plaats van op de commandoregel. Een job-token (`CI_JOB_TOKEN`) kan geen
120 120 runners beheren.
121
122 **Instellingen, pauze en jobs van een runner** (zie [runner.md](runner.md#lokale-api)):
123
124 - aparte runner: de lokale API op de runnermachine (`http://127.0.0.1:8765/api/...`)
125 met het beheertoken uit `sudo bluegit-runner ui-token`;
126 - ingebouwde runner: `/api/v1/admin/runner/{status,settings,jobs,pause,resume}`
127 met het token van een sitebeheerder (scope `runners` of `api`).
128
129 ```sh
130 curl -fsS -H "Authorization: Bearer $BLUEGIT_TOKEN" $BLUEGIT_URL/api/v1/admin/runner/status
131 curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
132 -d '{"concurrency":2,"memory_mb":4096}' $BLUEGIT_URL/api/v1/admin/runner/settings
133 ```
@@ -118,3 +118,16 @@ Het registratietoken is het enige geheim dat `bg` print, en alleen bij
118`bg runner token`; geef het via `BLUEGIT_RUNNER_REGISTRATION_TOKEN` door
118`bg runner token`; geef het via `BLUEGIT_RUNNER_REGISTRATION_TOKEN` door
119in plaats van op de commandoregel. Een job-token (`CI_JOB_TOKEN`) kan geen
119in plaats van op de commandoregel. Een job-token (`CI_JOB_TOKEN`) kan geen
120runners beheren.
120runners beheren.
121
122**Instellingen, pauze en jobs van een runner** (zie [runner.md](runner.md#lokale-api)):
123
124- aparte runner: de lokale API op de runnermachine (`http://127.0.0.1:8765/api/...`)
125 met het beheertoken uit `sudo bluegit-runner ui-token`;
126- ingebouwde runner: `/api/v1/admin/runner/{status,settings,jobs,pause,resume}`
127 met het token van een sitebeheerder (scope `runners` of `api`).
128
129```sh
130curl -fsS -H "Authorization: Bearer $BLUEGIT_TOKEN" $BLUEGIT_URL/api/v1/admin/runner/status
131curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
132 -d '{"concurrency":2,"memory_mb":4096}' $BLUEGIT_URL/api/v1/admin/runner/settings
133```
docs/embed.go added +9 −0
@@ -0,0 +1,9 @@
1 // Package docs bakt de Markdown-documentatie in de binary, voor /help.
2 package docs
3
4 import "embed"
5
6 // FS bevat alle .md-bestanden uit docs/.
7 //
8 //go:embed *.md
9 var FS embed.FS
@@ -0,0 +1,9 @@
1// Package docs bakt de Markdown-documentatie in de binary, voor /help.
2package docs
3
4import "embed"
5
6// FS bevat alle .md-bestanden uit docs/.
7//
8//go:embed *.md
9var FS embed.FS
docs/runner.en.md added +143 −0
@@ -0,0 +1,143 @@
1 # bluegit-runner — separate CI runner
2
3 `bluegit-runner` runs BlueGit CI jobs on your own machine, in Docker, just
4 like the built-in runner. It only makes **outgoing** HTTPS connections to
5 BlueGit (long-poll); no port has to be opened. The built-in BlueGit runner
6 stays available.
7
8 ## Network
9
10 - HTTPS (port 443) to the BlueGit server for heartbeat, jobs, logs and artifacts;
11 - internet access for whatever the jobs fetch (Docker images, packages).
12
13 **No inbound ports** are needed on the runner machine, also not behind NAT
14 or a home router. A proxy works through `HTTPS_PROXY` in the service
15 environment. The runner's own web interface listens on `127.0.0.1` only by default.
16
17 ## Install (Arch / AUR)
18
19 ```sh
20 yay -S bluegit-runner
21 ```
22
23 The package creates the system user `bluegit-runner` (member of `docker`),
24 installs and enables `bluegit-runner.service`. The service starts once
25 `/etc/bluegit-runner/config.yml` exists; an upgrade restarts it.
26
27 ## Install elsewhere (binary + systemd)
28
29 ```sh
30 git clone https://git.timfalken.com/timfa/bluegit.git && cd bluegit
31 go build -trimpath -ldflags "-X main.version=$(date +%Y%m%d%H%M%S)" -o bluegit-runner ./cmd/bluegit-runner
32 sudo install -Dm755 bluegit-runner /usr/bin/bluegit-runner
33 sudo install -Dm644 packaging/runner/bluegit-runner.service /usr/lib/systemd/system/bluegit-runner.service
34 sudo install -Dm644 packaging/runner/sysusers.conf /usr/lib/sysusers.d/bluegit-runner.conf
35 sudo install -Dm644 packaging/runner/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit-runner.conf
36 sudo systemd-sysusers && sudo systemd-tmpfiles --create
37 sudo usermod -aG docker bluegit-runner
38 sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
39 ```
40
41 Without systemd: `bluegit-runner run --config path/to/config.yml` as a user that may use Docker.
42
43 ## Register
44
45 - **1.** In BlueGit: **Settings → Runners → New registration token** (account runner) or **Group → Settings → Runners** (group runner, maintainers). The token (`bgrr_…`) is valid 24 hours, single use, shown once.
46 - **2.** On the machine: `sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]`. The runner gets its own token (`bgr_…`); the server stores only its hash. `register` starts the service and prints how to open the web interface.
47
48 ## Config
49
50 `/etc/bluegit-runner/config.yml`: `url`, `token`, `name`, `docker`, `git`,
51 `work_dir` (`/var/lib/bluegit-runner`), `network` (`bridge`), `concurrency`
52 (start value), `ui_listen` (`127.0.0.1:8765`, `off` disables the UI) and
53 `language` (`en`, `nl`, `de`, `fr`). Settings changed in the web interface
54 are stored in `work_dir/settings.json`.
55
56 ## Web interface
57
58 Every runner has its own admin screen in BlueGit style, in English, Dutch,
59 German and French.
60
61 - **Address**: `http://127.0.0.1:8765` by default. Change `ui_listen` or use an SSH tunnel: `ssh -L 8765:127.0.0.1:8765 runner-host`.
62 - **Access**: an admin token (`bgru_…`) created locally on first start in `work_dir/ui-token` (mode 0600). It is never logged; show it on the machine with `sudo bluegit-runner ui-token`.
63 - **Contents**: status (online, version, server, last contact), hardware with ★ recommendations, active and recent jobs, a *safe to upgrade* indicator, **Pause (drain)** / **Resume**, all settings, image presets and a docs page at `/docs`.
64
65 | setting | default | |
66 |---|---|---|
67 | name | hostname | shown in BlueGit and job logs; synced to the server on save and every heartbeat |
68 | labels | — | your own labels |
69 | jobs at the same time | `concurrency` | 1–64, live |
70 | maximum cached images | 20 | least recently used images above this are removed |
71 | maximum job duration | — | caps the pipeline timeout |
72 | CPUs / memory / processes per job | no limit | `docker run --cpus`, `--memory`, `--pids-limit` |
73 | disk budget | no limit | images, checkouts and cache together |
74 | pull policy | pull when missing | `always` or `never`; presets are always built locally |
75 | remove work dir after job | on | off keeps `work_dir/work/<job>` for debugging |
76 | remove dangling images | on | `docker image prune -f` after each job |
77 | maximum job cache | 10 GB | oldest cache directories first |
78
79 Recommendations assume ~2 cores and ~2 GB per job, keep 1 core and 1 GB
80 for the host and ~10 GB disk per job.
81
82 **Image presets** work like on Steve, the built-in runner: `image:
83 bluegit/node` is a Dockerfile built locally on first use and reused while it
84 stays the same. Add your own as a fixed image, a Dockerfile (optionally with
85 another `FROM`), or only another base image for a built-in preset.
86
87 **Pause (drain)** lets running jobs finish and picks up nothing new. The
88 heartbeat reports `draining`; BlueGit shows *paused on the runner* (API
89 `status: "draining"`) and routes jobs to the next runner or keeps them queued.
90
91 **Local API** (Bearer admin token): `GET /api/status`, `GET/PUT /api/settings`,
92 `GET /api/jobs`, `POST /api/pause`, `POST /api/resume`.
93
94 ```sh
95 T=$(sudo cat /var/lib/bluegit-runner/ui-token); U=http://127.0.0.1:8765
96 curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/pause
97 until curl -fsS -H "Authorization: Bearer $T" $U/api/status | grep -q '"safe_to_upgrade":true'; do sleep 10; done
98 sudo pacman -Syu bluegit-runner
99 curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/resume
100 ```
101
102 ## Built-in runner
103
104 Site administrators get the same screen for the runner inside BlueGit at
105 **/admin/runner**, and the API `/api/v1/admin/runner/{status,settings,jobs,pause,resume}`
106 (admin token, scope `runners` or `api`; others get `403`). Settings live in
107 `runner-settings.json` in the state directory. The self-update only waits for
108 jobs that are actually *running*, so a paused built-in runner does not block
109 an update; queued jobs start after resuming.
110
111 ## Security and isolation
112
113 - Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
114 - Docker access is root-equivalent on that machine; account runners only get jobs of their owner's repositories, group runners only of their group.
115 - The runner token is only in `config.yml` (0600); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
116 - Job secrets are masked in logs. The service runs with `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` and `PrivateTmp`.
117
118 ## Online, offline and lost runners
119
120 Heartbeat every **30 s**; **online** means contact in the last **90 s**.
121 If a runner disappears **during a job**, BlueGit fails the job with
122 `runner_system_failure` after **5 minutes** without contact; retry rules apply.
123
124 ## Remove or replace
125
126 Revoke the runner in BlueGit (the token stops working immediately), then
127 `sudo systemctl disable --now bluegit-runner` and remove the package. To
128 replace a machine: register the new one, revoke the old one, and copy
129 `settings.json` or use `PUT /api/settings`.
130
131 ## Troubleshooting
132
133 | Symptom | Cause and fix |
134 |---|---|
135 | stays *offline* | `journalctl -u bluegit-runner -f`; test `curl -I https://<server>/healthz` (DNS, proxy, outgoing 443). |
136 | `401` from the server | runner revoked: register again. |
137 | `registration failed (403)` | registration token expired or used. |
138 | `runner_system_failure: docker … is not available` | `sudo -u bluegit-runner docker info` must work (group `docker`, `docker.service`). |
139 | job stays *queued* | runner paused (locally or in BlueGit), all slots busy, or the runner does not serve this repository. |
140 | disk full | lower max images and job cache, enable dangling-image cleanup. |
141 | web interface does not open | check `ui_listen` and `ss -ltnp`; lost token: `sudo bluegit-runner ui-token`. |
142
143 Runner management through the BlueGit API for agents: [agents.md](agents.md#runners).
@@ -0,0 +1,143 @@
1# bluegit-runner — separate CI runner
2
3`bluegit-runner` runs BlueGit CI jobs on your own machine, in Docker, just
4like the built-in runner. It only makes **outgoing** HTTPS connections to
5BlueGit (long-poll); no port has to be opened. The built-in BlueGit runner
6stays available.
7
8## Network
9
10- HTTPS (port 443) to the BlueGit server for heartbeat, jobs, logs and artifacts;
11- internet access for whatever the jobs fetch (Docker images, packages).
12
13**No inbound ports** are needed on the runner machine, also not behind NAT
14or a home router. A proxy works through `HTTPS_PROXY` in the service
15environment. The runner's own web interface listens on `127.0.0.1` only by default.
16
17## Install (Arch / AUR)
18
19```sh
20yay -S bluegit-runner
21```
22
23The package creates the system user `bluegit-runner` (member of `docker`),
24installs and enables `bluegit-runner.service`. The service starts once
25`/etc/bluegit-runner/config.yml` exists; an upgrade restarts it.
26
27## Install elsewhere (binary + systemd)
28
29```sh
30git clone https://git.timfalken.com/timfa/bluegit.git && cd bluegit
31go build -trimpath -ldflags "-X main.version=$(date +%Y%m%d%H%M%S)" -o bluegit-runner ./cmd/bluegit-runner
32sudo install -Dm755 bluegit-runner /usr/bin/bluegit-runner
33sudo install -Dm644 packaging/runner/bluegit-runner.service /usr/lib/systemd/system/bluegit-runner.service
34sudo install -Dm644 packaging/runner/sysusers.conf /usr/lib/sysusers.d/bluegit-runner.conf
35sudo install -Dm644 packaging/runner/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit-runner.conf
36sudo systemd-sysusers && sudo systemd-tmpfiles --create
37sudo usermod -aG docker bluegit-runner
38sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
39```
40
41Without systemd: `bluegit-runner run --config path/to/config.yml` as a user that may use Docker.
42
43## Register
44
45- **1.** In BlueGit: **Settings → Runners → New registration token** (account runner) or **Group → Settings → Runners** (group runner, maintainers). The token (`bgrr_…`) is valid 24 hours, single use, shown once.
46- **2.** On the machine: `sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]`. The runner gets its own token (`bgr_…`); the server stores only its hash. `register` starts the service and prints how to open the web interface.
47
48## Config
49
50`/etc/bluegit-runner/config.yml`: `url`, `token`, `name`, `docker`, `git`,
51`work_dir` (`/var/lib/bluegit-runner`), `network` (`bridge`), `concurrency`
52(start value), `ui_listen` (`127.0.0.1:8765`, `off` disables the UI) and
53`language` (`en`, `nl`, `de`, `fr`). Settings changed in the web interface
54are stored in `work_dir/settings.json`.
55
56## Web interface
57
58Every runner has its own admin screen in BlueGit style, in English, Dutch,
59German and French.
60
61- **Address**: `http://127.0.0.1:8765` by default. Change `ui_listen` or use an SSH tunnel: `ssh -L 8765:127.0.0.1:8765 runner-host`.
62- **Access**: an admin token (`bgru_…`) created locally on first start in `work_dir/ui-token` (mode 0600). It is never logged; show it on the machine with `sudo bluegit-runner ui-token`.
63- **Contents**: status (online, version, server, last contact), hardware with ★ recommendations, active and recent jobs, a *safe to upgrade* indicator, **Pause (drain)** / **Resume**, all settings, image presets and a docs page at `/docs`.
64
65| setting | default | |
66|---|---|---|
67| name | hostname | shown in BlueGit and job logs; synced to the server on save and every heartbeat |
68| labels | — | your own labels |
69| jobs at the same time | `concurrency` | 1–64, live |
70| maximum cached images | 20 | least recently used images above this are removed |
71| maximum job duration | — | caps the pipeline timeout |
72| CPUs / memory / processes per job | no limit | `docker run --cpus`, `--memory`, `--pids-limit` |
73| disk budget | no limit | images, checkouts and cache together |
74| pull policy | pull when missing | `always` or `never`; presets are always built locally |
75| remove work dir after job | on | off keeps `work_dir/work/<job>` for debugging |
76| remove dangling images | on | `docker image prune -f` after each job |
77| maximum job cache | 10 GB | oldest cache directories first |
78
79Recommendations assume ~2 cores and ~2 GB per job, keep 1 core and 1 GB
80for the host and ~10 GB disk per job.
81
82**Image presets** work like on Steve, the built-in runner: `image:
83bluegit/node` is a Dockerfile built locally on first use and reused while it
84stays the same. Add your own as a fixed image, a Dockerfile (optionally with
85another `FROM`), or only another base image for a built-in preset.
86
87**Pause (drain)** lets running jobs finish and picks up nothing new. The
88heartbeat reports `draining`; BlueGit shows *paused on the runner* (API
89`status: "draining"`) and routes jobs to the next runner or keeps them queued.
90
91**Local API** (Bearer admin token): `GET /api/status`, `GET/PUT /api/settings`,
92`GET /api/jobs`, `POST /api/pause`, `POST /api/resume`.
93
94```sh
95T=$(sudo cat /var/lib/bluegit-runner/ui-token); U=http://127.0.0.1:8765
96curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/pause
97until curl -fsS -H "Authorization: Bearer $T" $U/api/status | grep -q '"safe_to_upgrade":true'; do sleep 10; done
98sudo pacman -Syu bluegit-runner
99curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/resume
100```
101
102## Built-in runner
103
104Site administrators get the same screen for the runner inside BlueGit at
105**/admin/runner**, and the API `/api/v1/admin/runner/{status,settings,jobs,pause,resume}`
106(admin token, scope `runners` or `api`; others get `403`). Settings live in
107`runner-settings.json` in the state directory. The self-update only waits for
108jobs that are actually *running*, so a paused built-in runner does not block
109an update; queued jobs start after resuming.
110
111## Security and isolation
112
113- Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
114- Docker access is root-equivalent on that machine; account runners only get jobs of their owner's repositories, group runners only of their group.
115- The runner token is only in `config.yml` (0600); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
116- Job secrets are masked in logs. The service runs with `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` and `PrivateTmp`.
117
118## Online, offline and lost runners
119
120Heartbeat every **30 s**; **online** means contact in the last **90 s**.
121If a runner disappears **during a job**, BlueGit fails the job with
122`runner_system_failure` after **5 minutes** without contact; retry rules apply.
123
124## Remove or replace
125
126Revoke the runner in BlueGit (the token stops working immediately), then
127`sudo systemctl disable --now bluegit-runner` and remove the package. To
128replace a machine: register the new one, revoke the old one, and copy
129`settings.json` or use `PUT /api/settings`.
130
131## Troubleshooting
132
133| Symptom | Cause and fix |
134|---|---|
135| stays *offline* | `journalctl -u bluegit-runner -f`; test `curl -I https://<server>/healthz` (DNS, proxy, outgoing 443). |
136| `401` from the server | runner revoked: register again. |
137| `registration failed (403)` | registration token expired or used. |
138| `runner_system_failure: docker … is not available` | `sudo -u bluegit-runner docker info` must work (group `docker`, `docker.service`). |
139| job stays *queued* | runner paused (locally or in BlueGit), all slots busy, or the runner does not serve this repository. |
140| disk full | lower max images and job cache, enable dangling-image cleanup. |
141| web interface does not open | check `ui_listen` and `ss -ltnp`; lost token: `sudo bluegit-runner ui-token`. |
142
143Runner management through the BlueGit API for agents: [agents.md](agents.md#runners).
docs/runner.md +192 −23
@@ -5,6 +5,18 @@ net als de ingebouwde runner. De runner maakt alleen **uitgaande**
5 5 HTTPS-verbindingen naar BlueGit (long-poll); er hoeft geen poort open.
6 6 De ingebouwde BlueGit-runner blijft gewoon bestaan.
7 7
8 ## Netwerk
9
10 De runner maakt alleen **uitgaande** verbindingen:
11
12 - HTTPS (poort 443) naar de BlueGit-server, voor heartbeat, jobs, logs en artifacts;
13 - internet voor wat de jobs zelf ophalen (Docker-images, packages).
14
15 Op de runnermachine hoeft **geen enkele poort open**, ook niet achter NAT
16 of een thuisrouter. Een proxy werkt via de gewone `HTTPS_PROXY`-variabele
17 in de service-omgeving. De eigen webinterface luistert standaard alleen op
18 `127.0.0.1` (zie [Webinterface](#webinterface)).
19
8 20 ## Installeren (Arch / AUR)
9 21
10 22 ```sh
@@ -15,17 +27,29 @@ Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
15 27 installeert `bluegit-runner.service` en zet die aan. De service start
16 28 zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
17 29
18 Andere systemen: `go build -o /usr/bin/bluegit-runner ./cmd/bluegit-runner`
19 en kopieer de bestanden uit `packaging/runner/` naar systemd
20 (`bluegit-runner.service`, `sysusers.d`, `tmpfiles.d`).
30 ## Installeren buiten Arch (binary + systemd)
31
32 Nodig: Docker, git en Go 1.22+ (alleen om te bouwen).
33
34 ```sh
35 git clone https://git.timfalken.com/timfa/bluegit.git && cd bluegit
36 go build -trimpath -ldflags "-X main.version=$(date +%Y%m%d%H%M%S)" -o bluegit-runner ./cmd/bluegit-runner
37 sudo install -Dm755 bluegit-runner /usr/bin/bluegit-runner
38 sudo install -Dm644 packaging/runner/bluegit-runner.service /usr/lib/systemd/system/bluegit-runner.service
39 sudo install -Dm644 packaging/runner/sysusers.conf /usr/lib/sysusers.d/bluegit-runner.conf
40 sudo install -Dm644 packaging/runner/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit-runner.conf
41 sudo systemd-sysusers && sudo systemd-tmpfiles --create
42 sudo usermod -aG docker bluegit-runner
43 sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
44 ```
45
46 Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --config pad/naar/config.yml`
47 als een gebruiker die Docker mag gebruiken.
21 48
22 49 ## Registreren
23 50
24 1. In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een
25 account-runner, of **Groep → Instellingen → Runners** voor een
26 groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig,
27 eenmalig, en je ziet het één keer.
28 2. Op de machine:
51 - **1.** In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een account-runner, of **Groep → Instellingen → Runners** voor een groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig, eenmalig, en je ziet het één keer.
52 - **2.** Op de machine:
29 53
30 54 ```sh
31 55 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
@@ -34,8 +58,7 @@ en kopieer de bestanden uit `packaging/runner/` naar systemd
34 58 De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
35 59 alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
36 60 (mode 0600, eigenaar `bluegit-runner`). `register` start de service.
37 3. In de UI staat de runner nu als **online**. Intrekken kan daar ook;
38 het token werkt dan meteen niet meer.
61 - **3.** In de UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
39 62
40 63 Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
41 64
@@ -52,14 +75,18 @@ Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
52 75 | `git` | `git` | git-binary |
53 76 | `work_dir` | `/var/lib/bluegit-runner` | werkmappen en cache |
54 77 | `network` | `bridge` | docker-netwerk voor jobs zonder services |
55 | `concurrency` | `1` | jobs tegelijk |
78 | `concurrency` | `1` | jobs tegelijk (startwaarde; daarna via de webinterface) |
79 | `ui_listen` | `127.0.0.1:8765` | adres van de webinterface; `off` zet hem uit |
80 | `language` | (browser) | standaardtaal van de webinterface: `en`, `nl`, `de`, `fr` |
81
82 Wat je in de webinterface instelt, staat in `work_dir/settings.json`
83 (schrijfbaar voor de service; `/etc` is dat onder `ProtectSystem=strict` niet).
56 84
57 85 ## Welke runner krijgt een job?
58 86
59 87 **Repo van een account** — voorkeur onder Instellingen → Runners:
60 88
61 - *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is*
62 (standaard): BlueGit-runner → eigen runners.
89 - *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is* (standaard): BlueGit-runner → eigen runners.
63 90 - *Eigen runners eerst*: eigen runners → BlueGit-runner.
64 91
65 92 **Repo van een groep**: groepsrunners → account-runners van maintainers
@@ -81,15 +108,12 @@ dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.
81 108
82 109 ## Wat gebeurt er per job
83 110
84 1. Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script,
85 variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
86 2. Clone via HTTPS met het runner-token, checkout van de sha.
87 3. Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.
88 4. Container draaien (zelfde code als de ingebouwde runner, incl. image
89 presets en services); log elke seconde naar
90 `POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).
91 5. Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).
92 6. `POST /api/v1/runner/jobs/{id}/finish`.
111 - **1.** Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script, variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
112 - **2.** Clone via HTTPS met het runner-token, checkout van de sha.
113 - **3.** Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.
114 - **4.** Container draaien (zelfde code als de ingebouwde runner, incl. image presets en services); log elke seconde naar `POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).
115 - **5.** Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).
116 - **6.** `POST /api/v1/runner/jobs/{id}/finish`.
93 117
94 118 Heartbeat: `POST /api/v1/runner/heartbeat` elke 30 s; online = contact in
95 119 de laatste 90 s. De **cache** (`cache:`) blijft lokaal op de
@@ -134,9 +158,154 @@ bg runner wait mijn-pc && bg runner list
134 158 `bluegit-runner register` leest `BLUEGIT_RUNNER_REGISTRATION_TOKEN`,
135 159 `BLUEGIT_RUNNER_URL` en `BLUEGIT_RUNNER_NAME` als de vlaggen ontbreken.
136 160
161 ## Webinterface
162
163 Elke `bluegit-runner` heeft een eigen beheerscherm in de BlueGit-stijl, in
164 het Nederlands, Engels, Duits en Frans (keuze rechtsboven, of `language` in
165 de config).
166
167 - **Adres**: standaard `http://127.0.0.1:8765`, alleen lokaal. Wijzig `ui_listen` (bv. `0.0.0.0:8765` op een vertrouwd netwerk) of gebruik een SSH-tunnel: `ssh -L 8765:127.0.0.1:8765 runnermachine`.
168 - **Toegang**: een beheertoken (`bgru_…`) dat bij de eerste start lokaal in `work_dir/ui-token` (mode 0600) wordt gemaakt. Het komt nooit in de logs; toon het op de machine zelf met `sudo bluegit-runner ui-token`. `register` noemt dat commando ook.
169 - **Inhoud**:
170 - status: online/offline, versie, server-URL, laatste contact, en of de runner in BlueGit gepauzeerd is;
171 - hardware: CPU-kernen, geheugen en vrije schijf, met **aanbevelingen** (★) per instelling en een knop *Aanbevelingen toepassen*;
172 - **upgraden**: aantal lopende jobs en *veilig om te upgraden* als er niets loopt, plus **Pauzeren (aflopen)** / **Hervatten**;
173 - actieve en recente jobs (job, project, pipeline, image, duur);
174 - instellingen (hieronder) en image-presets;
175 - een docs-pagina op `/docs`.
176
177 ### Instellingen
178
179 | instelling | standaard | wat |
180 |---|---|---|
181 | naam | hostname | naam in BlueGit en in de joblog; wordt bij opslaan (en elke heartbeat) naar de server gesynchroniseerd |
182 | labels | — | eigen labels voor je overzicht |
183 | jobs tegelijk | `concurrency` | 1–64, live aan te passen |
184 | maximaal aantal gecachte images | 20 | images die de runner gebruikte; boven dit aantal gaan de langst ongebruikte weg |
185 | maximale jobduur | — | begrenst de timeout uit de pipeline |
186 | CPU's / geheugen / processen per job | geen limiet | `docker run --cpus`, `--memory`, `--pids-limit` |
187 | schijfbudget | geen limiet | richtwaarde voor images, checkouts en cache samen |
188 | pull-beleid | ophalen als het ontbreekt | `always` haalt gewone images elke job opnieuw op, `never` gebruikt alleen lokale images; presets worden altijd lokaal gebouwd |
189 | werkmap na job verwijderen | aan | uit laat `work_dir/work/<job>` staan om te debuggen |
190 | dangling images opruimen | aan | `docker image prune -f` na elke job |
191 | maximale jobcache | 10 GB | oudste cachemappen eerst weg |
192
193 **Aanbevelingen** gaan uit van ~2 kernen en ~2 GB per job, houden 1 kern en
194 1 GB voor de host en rekenen ~10 GB schijf per job. Voorbeeld: 8 kernen,
195 16 GB, 200 GB vrij → 3 jobs tegelijk, 2 CPU's en 5120 MB per job.
196
197 ### Image-presets
198
199 Net als bij Steve (de ingebouwde runner): `image: bluegit/node` is geen
200 apart image maar een Dockerfile die bij het eerste gebruik lokaal wordt
201 gebouwd en hergebruikt zolang de Dockerfile gelijk blijft. De ingebouwde
202 presets (`bluegit/base`, `node`, `python`, `go`, `rust`, `java`, `dotnet`)
203 staan in de lijst. Eigen presets voeg je toe als:
204
205 - **vast image** (`team/node` → `node:22-alpine`), of
206 - **Dockerfile** (met optioneel een ander basis-image, `FROM`), of
207 - alleen een ander **basis-image** voor een ingebouwde preset (bv. `bluegit/python` vanaf `python:3.13-slim`).
208
209 ### Pauze (drain)
210
211 *Pauzeren* laat lopende jobs afmaken en pakt geen nieuwe op. De heartbeat
212 meldt `draining`, dus BlueGit toont de runner als **gepauzeerd op de
213 runner** (API: `status: "draining"`) en slaat hem over bij het verdelen:
214 jobs gaan naar de volgende runner of blijven in de wachtrij. *Hervatten*
215 zet alles terug. Dit staat los van pauzeren in BlueGit zelf
216 (`…/runners/{id}/pause`); beide houden nieuwe jobs tegen.
217
218 ### Lokale API
219
220 Met het beheertoken als Bearer-token (`Authorization: Bearer bgru_…`):
221
222 | Methode | Pad | |
223 |---|---|---|
224 | GET | `/api/status` | status, hardware, aanbevelingen, `active_jobs`, `safe_to_upgrade` |
225 | GET/PUT | `/api/settings` | alle instellingen als JSON (PUT: alleen de velden die je meestuurt veranderen) |
226 | GET | `/api/jobs` | `active` en `recent` |
227 | POST | `/api/pause`, `/api/resume` | pauze (drain) aan/uit |
228
229 Veilig upgraden vanuit een script:
230
231 ```sh
232 T=$(sudo cat /var/lib/bluegit-runner/ui-token); U=http://127.0.0.1:8765
233 curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/pause
234 until curl -fsS -H "Authorization: Bearer $T" $U/api/status | grep -q '"safe_to_upgrade":true'; do sleep 10; done
235 sudo pacman -Syu bluegit-runner # of je eigen installatie
236 curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/resume
237 ```
238
239 ## Ingebouwde runner
240
241 De runner in het BlueGit-proces (Steve, `runner.name`) heeft hetzelfde
242 scherm voor **sitebeheerders** op **/admin/runner** (menu *Runner*):
243 dezelfde instellingen, aanbevelingen voor de server, eigen presets (naast
244 `ci.presets` uit `config.yml`), opruimbeleid, pauze en het overzicht van
245 actieve jobs. Instellingen staan in `runner-settings.json` in de statemap
246 en gelden meteen. De API (token van een beheerder, scope `runners` of
247 `api`):
248
249 | Methode | Pad | |
250 |---|---|---|
251 | GET | `/api/v1/admin/runner/status` | status, hardware, aanbevelingen, `safe_to_upgrade` |
252 | GET/PUT | `/api/v1/admin/runner/settings` | instellingen |
253 | GET | `/api/v1/admin/runner/jobs` | actieve en recente jobs |
254 | POST | `/api/v1/admin/runner/pause`, `/resume` | drain aan/uit |
255
256 Niet-beheerders krijgen `403`. **Pauze en self-update**: de self-update
257 wacht alleen op jobs die echt *running* zijn. Een gepauzeerde ingebouwde
258 runner start niets nieuws, dus de update gaat door zodra de lopende jobs
259 klaar zijn; wachtende jobs blijven `queued` (of gaan naar een eigen
260 runner) en starten na het hervatten. Na een herstart blijft de pauze staan.
261
262 ## Security en isolatie
263
264 - Elke job draait in een **eigen Docker-container** (`docker run --rm`) met de checkout op `/workspace`; services in een eigen netwerk per job. Limieten per job (CPU, geheugen, processen) zet je in de webinterface.
265 - Docker-toegang is root-equivalent op die machine: geef een runner alleen jobs uit repo's die je vertrouwt (account-runners krijgen alleen jobs van repo's van hun eigenaar, groepsrunners alleen van hun groep).
266 - Het **runner-token** (`bgr_…`) staat alleen in `config.yml` (0600); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
267 - Geheimen uit de job worden in de log gemaskeerd, ook op de runner.
268 - De service draait met `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` en `PrivateTmp`; schrijven kan alleen in `/var/lib/bluegit-runner`.
269 - De webinterface luistert standaard op localhost, vraagt het beheertoken, gebruikt een `HttpOnly`/`SameSite=Strict`-cookie en CSRF-velden.
270
271 ## Online, offline en wegvallen
272
273 - Heartbeat elke **30 s**; **online** = contact in de laatste **90 s**.
274 - Een offline runner krijgt geen jobs; zijn trede wordt overgeslagen.
275 - Valt een runner **midden in een job** weg (stroom, netwerk, crash), dan zet BlueGit de job na **5 minuten** zonder contact op mislukt met `runner_system_failure`. Staat `retry` op `runner_system_failure` of `always`, dan wordt hij opnieuw ingepland (ook op een andere runner).
276 - Een herstart van de service tijdens een job: de job mislukt zo (na de 5 minuten); pauzeer daarom eerst (zie *Veilig upgraden* hierboven).
277
278 ## Verwijderen of vervangen
279
280 - **Intrekken**: in BlueGit bij de runner *Intrekken* (of `DELETE …/runners/{id}`). Het token werkt meteen niet meer; een lopende job mislukt.
281 - **Machine weg**: `sudo systemctl disable --now bluegit-runner`, `sudo pacman -Rns bluegit-runner` (of de bestanden weghalen) en de runner in BlueGit intrekken. `/var/lib/bluegit-runner` bevat cache, presets en het UI-token.
282 - **Vervangen** (nieuwe machine, zelfde naam): nieuw registratietoken, `register` op de nieuwe machine, de oude intrekken. Je instellingen kun je meenemen door `settings.json` te kopiëren of via `PUT /api/settings`.
283 - **Opnieuw registreren** op dezelfde machine: `register` overschrijft `url`, `token` en `name` in de config; de rest blijft.
284
137 285 ## Problemen
138 286
287 | Symptoom | Oorzaak en oplossing |
288 |---|---|
289 | Runner blijft *offline* | `journalctl -u bluegit-runner -f`. Komt de heartbeat niet aan, test `curl -I https://<server>/healthz` vanaf de machine (DNS, proxy, firewall uitgaand 443). |
290 | `cannot reach BlueGit: … 401` | Het runner-token is ingetrokken of onbekend: opnieuw registreren. |
291 | `registration failed (403)` | Registratietoken verlopen (24 u) of al gebruikt: maak een nieuwe. |
292 | Jobs mislukken met `runner_system_failure: docker … is not available` | `sudo -u bluegit-runner docker info` moet werken; zit de gebruiker in groep `docker` en draait `docker.service`? |
293 | `permission denied` op de Docker-socket | Na `usermod -aG docker` de service herstarten. |
294 | Clone mislukt (`403`) | Het runner-token mag alleen de repo van zijn eigen lopende job clonen; komt dit toch, kijk of de job niet al afgebroken is. |
295 | Job blijft *In wachtrij* | Runner gepauzeerd (lokaal of in BlueGit), `jobs tegelijk` vol, of de runner hoort niet bij deze repo/groep. Bekijk de runnervolgorde hierboven. |
296 | Image niet gevonden met pull-beleid *nooit* | Haal het image handmatig op (`docker pull`) of zet het beleid terug. |
297 | Preset bouwt niet | De bouwlog staat in de joblog (`Building image preset …`); test de Dockerfile met `docker build`. |
298 | Schijf vol | Verlaag *maximaal aantal images* en *maximale jobcache*, zet *dangling images opruimen* aan, of `docker system prune`. |
299 | Webinterface opent niet | Kijk `ui_listen` na, en of een ander programma de poort gebruikt (`ss -ltnp`). Token kwijt: `sudo bluegit-runner ui-token`; nieuw token: verwijder `work_dir/ui-token` en herstart. |
300 | Naam in BlueGit klopt niet | Zet de naam in de webinterface; die wint en gaat met de volgende heartbeat (≤ 30 s) mee. |
301
302 Handige commando's:
303
139 304 ```sh
140 305 journalctl -u bluegit-runner -f
141 sudo -u bluegit-runner docker info # moet werken (groep docker)
306 sudo -u bluegit-runner docker info
307 sudo bluegit-runner ui-token
308 bluegit-runner version
142 309 ```
310
311 Runnerbeheer via de BlueGit-API voor agents staat ook in [agents.md](agents.md#runners).
@@ -5,6 +5,18 @@ net als de ingebouwde runner. De runner maakt alleen **uitgaande**
5HTTPS-verbindingen naar BlueGit (long-poll); er hoeft geen poort open.
5HTTPS-verbindingen naar BlueGit (long-poll); er hoeft geen poort open.
6De ingebouwde BlueGit-runner blijft gewoon bestaan.
6De ingebouwde BlueGit-runner blijft gewoon bestaan.
7
7
8## Netwerk
9
10De runner maakt alleen **uitgaande** verbindingen:
11
12- HTTPS (poort 443) naar de BlueGit-server, voor heartbeat, jobs, logs en artifacts;
13- internet voor wat de jobs zelf ophalen (Docker-images, packages).
14
15Op de runnermachine hoeft **geen enkele poort open**, ook niet achter NAT
16of een thuisrouter. Een proxy werkt via de gewone `HTTPS_PROXY`-variabele
17in de service-omgeving. De eigen webinterface luistert standaard alleen op
18`127.0.0.1` (zie [Webinterface](#webinterface)).
19
8## Installeren (Arch / AUR)
20## Installeren (Arch / AUR)
9
21
10```sh
22```sh
@@ -15,17 +27,29 @@ Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
15installeert `bluegit-runner.service` en zet die aan. De service start
27installeert `bluegit-runner.service` en zet die aan. De service start
16zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
28zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
17
29
18Andere systemen: `go build -o /usr/bin/bluegit-runner ./cmd/bluegit-runner`
30## Installeren buiten Arch (binary + systemd)
19en kopieer de bestanden uit `packaging/runner/` naar systemd
31
20(`bluegit-runner.service`, `sysusers.d`, `tmpfiles.d`).
32Nodig: Docker, git en Go 1.22+ (alleen om te bouwen).
33
34```sh
35git clone https://git.timfalken.com/timfa/bluegit.git && cd bluegit
36go build -trimpath -ldflags "-X main.version=$(date +%Y%m%d%H%M%S)" -o bluegit-runner ./cmd/bluegit-runner
37sudo install -Dm755 bluegit-runner /usr/bin/bluegit-runner
38sudo install -Dm644 packaging/runner/bluegit-runner.service /usr/lib/systemd/system/bluegit-runner.service
39sudo install -Dm644 packaging/runner/sysusers.conf /usr/lib/sysusers.d/bluegit-runner.conf
40sudo install -Dm644 packaging/runner/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit-runner.conf
41sudo systemd-sysusers && sudo systemd-tmpfiles --create
42sudo usermod -aG docker bluegit-runner
43sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
44```
45
46Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --config pad/naar/config.yml`
47als een gebruiker die Docker mag gebruiken.
21
48
22## Registreren
49## Registreren
23
50
241. In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een
51- **1.** In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een account-runner, of **Groep → Instellingen → Runners** voor een groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig, eenmalig, en je ziet het één keer.
25 account-runner, of **Groep → Instellingen → Runners** voor een
52- **2.** Op de machine:
26 groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig,
27 eenmalig, en je ziet het één keer.
282. Op de machine:
29
53
30 ```sh
54 ```sh
31 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
55 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
@@ -34,8 +58,7 @@ en kopieer de bestanden uit `packaging/runner/` naar systemd
34 De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
58 De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
35 alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
59 alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
36 (mode 0600, eigenaar `bluegit-runner`). `register` start de service.
60 (mode 0600, eigenaar `bluegit-runner`). `register` start de service.
373. In de UI staat de runner nu als **online**. Intrekken kan daar ook;
61- **3.** In de UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
38 het token werkt dan meteen niet meer.
39
62
40Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
63Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
41
64
@@ -52,14 +75,18 @@ Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
52| `git` | `git` | git-binary |
75| `git` | `git` | git-binary |
53| `work_dir` | `/var/lib/bluegit-runner` | werkmappen en cache |
76| `work_dir` | `/var/lib/bluegit-runner` | werkmappen en cache |
54| `network` | `bridge` | docker-netwerk voor jobs zonder services |
77| `network` | `bridge` | docker-netwerk voor jobs zonder services |
55| `concurrency` | `1` | jobs tegelijk |
78| `concurrency` | `1` | jobs tegelijk (startwaarde; daarna via de webinterface) |
79| `ui_listen` | `127.0.0.1:8765` | adres van de webinterface; `off` zet hem uit |
80| `language` | (browser) | standaardtaal van de webinterface: `en`, `nl`, `de`, `fr` |
81
82Wat je in de webinterface instelt, staat in `work_dir/settings.json`
83(schrijfbaar voor de service; `/etc` is dat onder `ProtectSystem=strict` niet).
56
84
57## Welke runner krijgt een job?
85## Welke runner krijgt een job?
58
86
59**Repo van een account** — voorkeur onder Instellingen → Runners:
87**Repo van een account** — voorkeur onder Instellingen → Runners:
60
88
61- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is*
89- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is* (standaard): BlueGit-runner → eigen runners.
62 (standaard): BlueGit-runner → eigen runners.
63- *Eigen runners eerst*: eigen runners → BlueGit-runner.
90- *Eigen runners eerst*: eigen runners → BlueGit-runner.
64
91
65**Repo van een groep**: groepsrunners → account-runners van maintainers
92**Repo van een groep**: groepsrunners → account-runners van maintainers
@@ -81,15 +108,12 @@ dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.
81
108
82## Wat gebeurt er per job
109## Wat gebeurt er per job
83
110
841. Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script,
111- **1.** Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script, variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
85 variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
112- **2.** Clone via HTTPS met het runner-token, checkout van de sha.
862. Clone via HTTPS met het runner-token, checkout van de sha.
113- **3.** Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.
873. Artifacts van eerdere jobs: `GET /api/v1/runner/jobs/{id}/inputs`.
114- **4.** Container draaien (zelfde code als de ingebouwde runner, incl. image presets en services); log elke seconde naar `POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).
884. Container draaien (zelfde code als de ingebouwde runner, incl. image
115- **5.** Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).
89 presets en services); log elke seconde naar
116- **6.** `POST /api/v1/runner/jobs/{id}/finish`.
90 `POST /api/v1/runner/jobs/{id}/log` (antwoord `{"cancel":true}` stopt de job).
915. Artifacts: `PUT /api/v1/runner/jobs/{id}/artifacts` (alleen de gedeclareerde paden).
926. `POST /api/v1/runner/jobs/{id}/finish`.
93
117
94Heartbeat: `POST /api/v1/runner/heartbeat` elke 30 s; online = contact in
118Heartbeat: `POST /api/v1/runner/heartbeat` elke 30 s; online = contact in
95de laatste 90 s. De **cache** (`cache:`) blijft lokaal op de
119de laatste 90 s. De **cache** (`cache:`) blijft lokaal op de
@@ -134,9 +158,154 @@ bg runner wait mijn-pc && bg runner list
134`bluegit-runner register` leest `BLUEGIT_RUNNER_REGISTRATION_TOKEN`,
158`bluegit-runner register` leest `BLUEGIT_RUNNER_REGISTRATION_TOKEN`,
135`BLUEGIT_RUNNER_URL` en `BLUEGIT_RUNNER_NAME` als de vlaggen ontbreken.
159`BLUEGIT_RUNNER_URL` en `BLUEGIT_RUNNER_NAME` als de vlaggen ontbreken.
136
160
161## Webinterface
162
163Elke `bluegit-runner` heeft een eigen beheerscherm in de BlueGit-stijl, in
164het Nederlands, Engels, Duits en Frans (keuze rechtsboven, of `language` in
165de config).
166
167- **Adres**: standaard `http://127.0.0.1:8765`, alleen lokaal. Wijzig `ui_listen` (bv. `0.0.0.0:8765` op een vertrouwd netwerk) of gebruik een SSH-tunnel: `ssh -L 8765:127.0.0.1:8765 runnermachine`.
168- **Toegang**: een beheertoken (`bgru_…`) dat bij de eerste start lokaal in `work_dir/ui-token` (mode 0600) wordt gemaakt. Het komt nooit in de logs; toon het op de machine zelf met `sudo bluegit-runner ui-token`. `register` noemt dat commando ook.
169- **Inhoud**:
170 - status: online/offline, versie, server-URL, laatste contact, en of de runner in BlueGit gepauzeerd is;
171 - hardware: CPU-kernen, geheugen en vrije schijf, met **aanbevelingen** (★) per instelling en een knop *Aanbevelingen toepassen*;
172 - **upgraden**: aantal lopende jobs en *veilig om te upgraden* als er niets loopt, plus **Pauzeren (aflopen)** / **Hervatten**;
173 - actieve en recente jobs (job, project, pipeline, image, duur);
174 - instellingen (hieronder) en image-presets;
175 - een docs-pagina op `/docs`.
176
177### Instellingen
178
179| instelling | standaard | wat |
180|---|---|---|
181| naam | hostname | naam in BlueGit en in de joblog; wordt bij opslaan (en elke heartbeat) naar de server gesynchroniseerd |
182| labels | — | eigen labels voor je overzicht |
183| jobs tegelijk | `concurrency` | 1–64, live aan te passen |
184| maximaal aantal gecachte images | 20 | images die de runner gebruikte; boven dit aantal gaan de langst ongebruikte weg |
185| maximale jobduur | — | begrenst de timeout uit de pipeline |
186| CPU's / geheugen / processen per job | geen limiet | `docker run --cpus`, `--memory`, `--pids-limit` |
187| schijfbudget | geen limiet | richtwaarde voor images, checkouts en cache samen |
188| pull-beleid | ophalen als het ontbreekt | `always` haalt gewone images elke job opnieuw op, `never` gebruikt alleen lokale images; presets worden altijd lokaal gebouwd |
189| werkmap na job verwijderen | aan | uit laat `work_dir/work/<job>` staan om te debuggen |
190| dangling images opruimen | aan | `docker image prune -f` na elke job |
191| maximale jobcache | 10 GB | oudste cachemappen eerst weg |
192
193**Aanbevelingen** gaan uit van ~2 kernen en ~2 GB per job, houden 1 kern en
1941 GB voor de host en rekenen ~10 GB schijf per job. Voorbeeld: 8 kernen,
19516 GB, 200 GB vrij → 3 jobs tegelijk, 2 CPU's en 5120 MB per job.
196
197### Image-presets
198
199Net als bij Steve (de ingebouwde runner): `image: bluegit/node` is geen
200apart image maar een Dockerfile die bij het eerste gebruik lokaal wordt
201gebouwd en hergebruikt zolang de Dockerfile gelijk blijft. De ingebouwde
202presets (`bluegit/base`, `node`, `python`, `go`, `rust`, `java`, `dotnet`)
203staan in de lijst. Eigen presets voeg je toe als:
204
205- **vast image** (`team/node` → `node:22-alpine`), of
206- **Dockerfile** (met optioneel een ander basis-image, `FROM`), of
207- alleen een ander **basis-image** voor een ingebouwde preset (bv. `bluegit/python` vanaf `python:3.13-slim`).
208
209### Pauze (drain)
210
211*Pauzeren* laat lopende jobs afmaken en pakt geen nieuwe op. De heartbeat
212meldt `draining`, dus BlueGit toont de runner als **gepauzeerd op de
213runner** (API: `status: "draining"`) en slaat hem over bij het verdelen:
214jobs gaan naar de volgende runner of blijven in de wachtrij. *Hervatten*
215zet alles terug. Dit staat los van pauzeren in BlueGit zelf
216(`…/runners/{id}/pause`); beide houden nieuwe jobs tegen.
217
218### Lokale API
219
220Met het beheertoken als Bearer-token (`Authorization: Bearer bgru_…`):
221
222| Methode | Pad | |
223|---|---|---|
224| GET | `/api/status` | status, hardware, aanbevelingen, `active_jobs`, `safe_to_upgrade` |
225| GET/PUT | `/api/settings` | alle instellingen als JSON (PUT: alleen de velden die je meestuurt veranderen) |
226| GET | `/api/jobs` | `active` en `recent` |
227| POST | `/api/pause`, `/api/resume` | pauze (drain) aan/uit |
228
229Veilig upgraden vanuit een script:
230
231```sh
232T=$(sudo cat /var/lib/bluegit-runner/ui-token); U=http://127.0.0.1:8765
233curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/pause
234until curl -fsS -H "Authorization: Bearer $T" $U/api/status | grep -q '"safe_to_upgrade":true'; do sleep 10; done
235sudo pacman -Syu bluegit-runner # of je eigen installatie
236curl -fsS -X POST -H "Authorization: Bearer $T" $U/api/resume
237```
238
239## Ingebouwde runner
240
241De runner in het BlueGit-proces (Steve, `runner.name`) heeft hetzelfde
242scherm voor **sitebeheerders** op **/admin/runner** (menu *Runner*):
243dezelfde instellingen, aanbevelingen voor de server, eigen presets (naast
244`ci.presets` uit `config.yml`), opruimbeleid, pauze en het overzicht van
245actieve jobs. Instellingen staan in `runner-settings.json` in de statemap
246en gelden meteen. De API (token van een beheerder, scope `runners` of
247`api`):
248
249| Methode | Pad | |
250|---|---|---|
251| GET | `/api/v1/admin/runner/status` | status, hardware, aanbevelingen, `safe_to_upgrade` |
252| GET/PUT | `/api/v1/admin/runner/settings` | instellingen |
253| GET | `/api/v1/admin/runner/jobs` | actieve en recente jobs |
254| POST | `/api/v1/admin/runner/pause`, `/resume` | drain aan/uit |
255
256Niet-beheerders krijgen `403`. **Pauze en self-update**: de self-update
257wacht alleen op jobs die echt *running* zijn. Een gepauzeerde ingebouwde
258runner start niets nieuws, dus de update gaat door zodra de lopende jobs
259klaar zijn; wachtende jobs blijven `queued` (of gaan naar een eigen
260runner) en starten na het hervatten. Na een herstart blijft de pauze staan.
261
262## Security en isolatie
263
264- Elke job draait in een **eigen Docker-container** (`docker run --rm`) met de checkout op `/workspace`; services in een eigen netwerk per job. Limieten per job (CPU, geheugen, processen) zet je in de webinterface.
265- Docker-toegang is root-equivalent op die machine: geef een runner alleen jobs uit repo's die je vertrouwt (account-runners krijgen alleen jobs van repo's van hun eigenaar, groepsrunners alleen van hun groep).
266- Het **runner-token** (`bgr_…`) staat alleen in `config.yml` (0600); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
267- Geheimen uit de job worden in de log gemaskeerd, ook op de runner.
268- De service draait met `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` en `PrivateTmp`; schrijven kan alleen in `/var/lib/bluegit-runner`.
269- De webinterface luistert standaard op localhost, vraagt het beheertoken, gebruikt een `HttpOnly`/`SameSite=Strict`-cookie en CSRF-velden.
270
271## Online, offline en wegvallen
272
273- Heartbeat elke **30 s**; **online** = contact in de laatste **90 s**.
274- Een offline runner krijgt geen jobs; zijn trede wordt overgeslagen.
275- Valt een runner **midden in een job** weg (stroom, netwerk, crash), dan zet BlueGit de job na **5 minuten** zonder contact op mislukt met `runner_system_failure`. Staat `retry` op `runner_system_failure` of `always`, dan wordt hij opnieuw ingepland (ook op een andere runner).
276- Een herstart van de service tijdens een job: de job mislukt zo (na de 5 minuten); pauzeer daarom eerst (zie *Veilig upgraden* hierboven).
277
278## Verwijderen of vervangen
279
280- **Intrekken**: in BlueGit bij de runner *Intrekken* (of `DELETE …/runners/{id}`). Het token werkt meteen niet meer; een lopende job mislukt.
281- **Machine weg**: `sudo systemctl disable --now bluegit-runner`, `sudo pacman -Rns bluegit-runner` (of de bestanden weghalen) en de runner in BlueGit intrekken. `/var/lib/bluegit-runner` bevat cache, presets en het UI-token.
282- **Vervangen** (nieuwe machine, zelfde naam): nieuw registratietoken, `register` op de nieuwe machine, de oude intrekken. Je instellingen kun je meenemen door `settings.json` te kopiëren of via `PUT /api/settings`.
283- **Opnieuw registreren** op dezelfde machine: `register` overschrijft `url`, `token` en `name` in de config; de rest blijft.
284
137## Problemen
285## Problemen
138
286
287| Symptoom | Oorzaak en oplossing |
288|---|---|
289| Runner blijft *offline* | `journalctl -u bluegit-runner -f`. Komt de heartbeat niet aan, test `curl -I https://<server>/healthz` vanaf de machine (DNS, proxy, firewall uitgaand 443). |
290| `cannot reach BlueGit: … 401` | Het runner-token is ingetrokken of onbekend: opnieuw registreren. |
291| `registration failed (403)` | Registratietoken verlopen (24 u) of al gebruikt: maak een nieuwe. |
292| Jobs mislukken met `runner_system_failure: docker … is not available` | `sudo -u bluegit-runner docker info` moet werken; zit de gebruiker in groep `docker` en draait `docker.service`? |
293| `permission denied` op de Docker-socket | Na `usermod -aG docker` de service herstarten. |
294| Clone mislukt (`403`) | Het runner-token mag alleen de repo van zijn eigen lopende job clonen; komt dit toch, kijk of de job niet al afgebroken is. |
295| Job blijft *In wachtrij* | Runner gepauzeerd (lokaal of in BlueGit), `jobs tegelijk` vol, of de runner hoort niet bij deze repo/groep. Bekijk de runnervolgorde hierboven. |
296| Image niet gevonden met pull-beleid *nooit* | Haal het image handmatig op (`docker pull`) of zet het beleid terug. |
297| Preset bouwt niet | De bouwlog staat in de joblog (`Building image preset …`); test de Dockerfile met `docker build`. |
298| Schijf vol | Verlaag *maximaal aantal images* en *maximale jobcache*, zet *dangling images opruimen* aan, of `docker system prune`. |
299| Webinterface opent niet | Kijk `ui_listen` na, en of een ander programma de poort gebruikt (`ss -ltnp`). Token kwijt: `sudo bluegit-runner ui-token`; nieuw token: verwijder `work_dir/ui-token` en herstart. |
300| Naam in BlueGit klopt niet | Zet de naam in de webinterface; die wint en gaat met de volgende heartbeat (≤ 30 s) mee. |
301
302Handige commando's:
303
139```sh
304```sh
140journalctl -u bluegit-runner -f
305journalctl -u bluegit-runner -f
141sudo -u bluegit-runner docker info # moet werken (groep docker)
306sudo -u bluegit-runner docker info
307sudo bluegit-runner ui-token
308bluegit-runner version
142```
309```
310
311Runnerbeheer via de BlueGit-API voor agents staat ook in [agents.md](agents.md#runners).
internal/i18n/catalog_rui.go added +646 −0
@@ -0,0 +1,646 @@
1 // Code gegenereerd door tools/gen/cat.py; vertalingen voor /help, /admin/runner
2 // en de webinterface van bluegit-runner.
3 package i18n
4
5 func init() {
6 addCatalog(en, ruiEN)
7 addCatalog(nl, ruiNL)
8 addCatalog(de, ruiDE)
9 addCatalog(fr, ruiFR)
10 }
11
12 var ruiEN = map[string]string{
13 "nav.help": "Help",
14 "nav.adminRunner": "Runner",
15 "title.help": "Help",
16 "help.lead": "Documentation for BlueGit, its runners and the API, always matching the running version.",
17 "help.fallback": "This page is not available in your language yet; it is shown in another language.",
18 "help.otherLang": "other language",
19 "help.runnerDocs": "Runner documentation",
20 "help.runners": "Runners",
21 "help.api": "API",
22 "help.what": "What is this?",
23 "runner.draining": "paused on the runner",
24 "rui.brand": "BlueGit runner",
25 "rui.title": "Runner",
26 "rui.lead": "Manage this bluegit-runner: capacity, limits per job, image presets, pause and the jobs it is running.",
27 "rui.leadBuiltin": "The built-in BlueGit runner runs on this server. Only site administrators can change it.",
28 "rui.ciOff": "CI is disabled on this server.",
29 "rui.state.online": "online",
30 "rui.state.offline": "offline",
31 "rui.state.paused": "paused",
32 "rui.state.draining": "draining",
33 "rui.status": "Status",
34 "rui.version": "Version",
35 "rui.server": "Server",
36 "rui.contact": "Last contact",
37 "rui.serverPause": "Paused in BlueGit",
38 "rui.hardware": "Hardware",
39 "rui.hw.cpu": "CPU cores",
40 "rui.hw.mem": "Memory",
41 "rui.hw.disk": "Disk (work dir)",
42 "rui.hw.diskVal": "%d GB free of %d GB",
43 "rui.upgrade": "Upgrade",
44 "rui.activeCount": "jobs running",
45 "rui.safe": "Safe to upgrade: nothing is running.",
46 "rui.notSafe": "Not safe yet: pause the runner and wait until the jobs are done.",
47 "rui.pause": "Pause (drain)",
48 "rui.resume": "Resume",
49 "rui.pauseAsk": "Pause this runner? Running jobs finish, new jobs wait or go to another runner.",
50 "rui.pauseHelp": "Paused: running jobs finish, no new jobs are picked up and BlueGit shows the runner as paused.",
51 "rui.active": "Active jobs",
52 "rui.recent": "Recent jobs",
53 "rui.noActive": "No jobs are running.",
54 "rui.noRecent": "No finished jobs since the runner started.",
55 "rui.col.job": "Job",
56 "rui.col.project": "Project",
57 "rui.col.image": "Image",
58 "rui.col.duration": "Duration",
59 "rui.col.status": "Status",
60 "rui.col.finished": "Finished",
61 "rui.col.alias": "Alias",
62 "rui.col.base": "Based on",
63 "rui.col.kind": "Source",
64 "rui.pipeline": "pipeline #%d",
65 "rui.job.success": "passed",
66 "rui.job.failed": "failed",
67 "rui.job.canceled": "canceled",
68 "rui.settings": "Settings",
69 "rui.applyRec": "Apply recommendations",
70 "rui.recLead": "★ shows the recommended value for the detected hardware. Empty means no limit.",
71 "rui.rec": "recommended: %v",
72 "rui.unlimited": "no limit",
73 "rui.grp.general": "General",
74 "rui.grp.capacity": "Capacity",
75 "rui.grp.limits": "Limits per job",
76 "rui.grp.images": "Images and cleanup",
77 "rui.f.name": "Name",
78 "rui.h.name": "Shown in BlueGit and in job logs; synced to the server on save.",
79 "rui.h.nameBuiltin": "Shown on job pages and in job logs. Empty uses runner.name from the configuration.",
80 "rui.f.labels": "Labels",
81 "rui.h.labels": "Comma separated, for your own overview (for example docker, gpu).",
82 "rui.f.concurrency": "Jobs at the same time",
83 "rui.f.maxImages": "Maximum cached images",
84 "rui.f.timeout": "Maximum job duration (minutes)",
85 "rui.h.timeout": "Caps the timeout from the pipeline; empty follows the pipeline.",
86 "rui.f.cpus": "CPUs per job",
87 "rui.f.memory": "Memory per job (MB)",
88 "rui.f.pids": "Processes per job",
89 "rui.f.disk": "Disk budget (GB)",
90 "rui.h.disk": "images, checkouts and cache together",
91 "rui.f.pull": "Pull policy",
92 "rui.pull.ifNotPresent": "Pull when missing",
93 "rui.pull.always": "Always pull",
94 "rui.pull.never": "Never pull (local images only)",
95 "rui.h.pull": "For normal images; presets are always built locally.",
96 "rui.f.cleanupWork": "Remove the work directory after each job",
97 "rui.f.pruneDangling": "Remove dangling images",
98 "rui.f.pruneCache": "Maximum job cache (GB)",
99 "rui.save": "Save settings",
100 "rui.presets": "Image presets",
101 "rui.presetsLead": "Aliases such as bluegit/node that a job can use as image. Built-in presets are Dockerfiles that are built locally on first use; add your own as an image or a Dockerfile.",
102 "rui.kind.builtin": "built-in",
103 "rui.kind.config": "config file",
104 "rui.kind.own": "own",
105 "rui.delete": "Delete",
106 "rui.presetDelAsk": "Delete this preset? Jobs that use it fail until you add it again.",
107 "rui.presetAdd": "Add or change a preset",
108 "rui.presetSave": "Save preset",
109 "rui.f.alias": "Alias",
110 "rui.h.alias": "Lowercase with a slash, for example team/tools. A built-in name replaces that preset.",
111 "rui.f.image": "Image",
112 "rui.h.image": "Use this image as is (no build). Leave empty for a Dockerfile.",
113 "rui.f.from": "Base image (FROM)",
114 "rui.h.from": "Replaces the first FROM of the Dockerfile or of a built-in preset.",
115 "rui.f.note": "Note",
116 "rui.f.dockerfile": "Dockerfile",
117 "rui.h.dockerfile": "Built once and reused while the Dockerfile stays the same.",
118 "rui.docs": "Documentation",
119 "rui.docsLead": "Everything here is also available through the API:",
120 "rui.ok.saved": "Settings saved.",
121 "rui.ok.recommended": "Recommended values applied.",
122 "rui.ok.paused": "Runner paused. Running jobs finish; new jobs are not picked up.",
123 "rui.ok.resumed": "Runner resumed.",
124 "rui.ok.preset": "Preset saved.",
125 "rui.ok.presetDeleted": "Preset deleted.",
126 "rui.err.save": "Saving failed.",
127 "rui.err.name": "The name may contain letters, digits, spaces, dots, dashes and underscores (max. 63).",
128 "rui.err.concurrency": "Jobs at the same time must be between 1 and 64.",
129 "rui.err.images": "Maximum cached images must be between 1 and 1000.",
130 "rui.err.limits": "Limits must be positive numbers.",
131 "rui.err.memory": "Memory per job must be at least 64 MB.",
132 "rui.err.pull": "Unknown pull policy.",
133 "rui.err.label": "Invalid label: %s",
134 "rui.err.presetDup": "Preset %s appears twice.",
135 "rui.err.presetEmpty": "Preset %s: give an image, a Dockerfile or a base image.",
136 "rui.err.presetBoth": "Preset %s: an image cannot be combined with a Dockerfile or base image.",
137 "rui.err.presetFrom": "Preset %s: a base image alone only works for a built-in preset.",
138 "rui.err.presetDockerfile": "Preset %s: the Dockerfile needs a FROM line.",
139 "rui.err.preset": "Preset %s is invalid: %s",
140 "rui.nav.overview": "Overview",
141 "rui.nav.docs": "Docs",
142 "rui.nav.logout": "Sign out",
143 "rui.login": "Sign in to the runner",
144 "rui.loginLead": "Use the admin token of this machine. Show it on the machine itself with:",
145 "rui.loginBad": "That token is not correct.",
146 "rui.token": "Admin token",
147 "rui.loginBtn": "Sign in",
148 "rdoc.title": "Runner documentation",
149 "rdoc.intro.h": "What this runner does",
150 "rdoc.intro.p": "bluegit-runner runs CI jobs from BlueGit in Docker containers on this machine. It asks the server for work; the server never connects to the runner.",
151 "rdoc.network.h": "Network",
152 "rdoc.network.p": "Only outgoing HTTPS (port 443) to the BlueGit server is needed, plus internet access for images and packages the jobs fetch. No ports have to be opened, also not behind NAT.",
153 "rdoc.ui.h": "This web interface",
154 "rdoc.ui.p": "It listens on 127.0.0.1:8765 by default. Change ui_listen in /etc/bluegit-runner/config.yml (or set it to off). Sign in with the admin token from bluegit-runner ui-token; it is stored in the work directory with mode 0600 and never written to the logs. Use an SSH tunnel to reach it from another computer.",
155 "rdoc.settings.h": "Settings and recommendations",
156 "rdoc.settings.p": "Settings are stored in settings.json in the work directory and apply immediately. Recommendations assume about 2 cores and 2 GB per job, keep 1 core and 1 GB for the host and about 10 GB of disk per job. Limits per job become docker run --cpus, --memory and --pids-limit.",
157 "rdoc.presets.h": "Image presets",
158 "rdoc.presets.p": "Presets work like on the built-in runner: image: bluegit/node in a pipeline is a Dockerfile that is built here on first use and reused while it stays the same. Add your own preset as a fixed image or as a Dockerfile, optionally with another base image.",
159 "rdoc.pause.h": "Pause (drain)",
160 "rdoc.pause.p": "Pause lets running jobs finish and stops picking up new ones. BlueGit shows the runner as paused and sends its jobs to the next runner in line, or keeps them queued.",
161 "rdoc.upgrade.h": "Upgrading safely",
162 "rdoc.upgrade.p": "Pause the runner, wait until the overview says it is safe to upgrade (no active jobs), upgrade the package (for example yay -Syu bluegit-runner) and resume. A job that is cut off mid-run is marked failed by the server after 5 minutes without contact and retried when its retry rules allow it.",
163 "rdoc.api.h": "Local API",
164 "rdoc.api.p": "The same actions are available as JSON with the admin token as Bearer token: GET /api/status, GET and PUT /api/settings, GET /api/jobs, POST /api/pause and POST /api/resume.",
165 "rdoc.trouble.h": "Troubleshooting",
166 "rdoc.trouble.p": "Offline in BlueGit: check journalctl -u bluegit-runner and whether HTTPS to the server works. Jobs fail with runner_system_failure: check docker info as the bluegit-runner user (group docker). 401 from the server: the runner was revoked; register again. The web interface does not open: check ui_listen and that nothing else uses the port.",
167 "rdoc.cmd.h": "Useful commands",
168 "rdoc.more": "Full documentation on the server:",
169 }
170
171 var ruiNL = map[string]string{
172 "nav.help": "Help",
173 "nav.adminRunner": "Runner",
174 "title.help": "Help",
175 "help.lead": "Documentatie voor BlueGit, de runners en de API, altijd passend bij de draaiende versie.",
176 "help.fallback": "Deze pagina is nog niet in je taal beschikbaar en wordt in een andere taal getoond.",
177 "help.otherLang": "andere taal",
178 "help.runnerDocs": "Runnerdocumentatie",
179 "help.runners": "Runners",
180 "help.api": "API",
181 "help.what": "Wat is dit?",
182 "runner.draining": "gepauzeerd op de runner",
183 "rui.brand": "BlueGit-runner",
184 "rui.title": "Runner",
185 "rui.lead": "Beheer deze bluegit-runner: capaciteit, limieten per job, image-presets, pauze en de jobs die hij draait.",
186 "rui.leadBuiltin": "De ingebouwde BlueGit-runner draait op deze server. Alleen sitebeheerders kunnen hem aanpassen.",
187 "rui.ciOff": "CI staat uit op deze server.",
188 "rui.state.online": "online",
189 "rui.state.offline": "offline",
190 "rui.state.paused": "gepauzeerd",
191 "rui.state.draining": "loopt af",
192 "rui.status": "Status",
193 "rui.version": "Versie",
194 "rui.server": "Server",
195 "rui.contact": "Laatste contact",
196 "rui.serverPause": "Gepauzeerd in BlueGit",
197 "rui.hardware": "Hardware",
198 "rui.hw.cpu": "CPU-kernen",
199 "rui.hw.mem": "Geheugen",
200 "rui.hw.disk": "Schijf (werkmap)",
201 "rui.hw.diskVal": "%d GB vrij van %d GB",
202 "rui.upgrade": "Upgraden",
203 "rui.activeCount": "jobs bezig",
204 "rui.safe": "Veilig om te upgraden: er draait niets.",
205 "rui.notSafe": "Nog niet veilig: pauzeer de runner en wacht tot de jobs klaar zijn.",
206 "rui.pause": "Pauzeren (aflopen)",
207 "rui.resume": "Hervatten",
208 "rui.pauseAsk": "Deze runner pauzeren? Lopende jobs maken af, nieuwe wachten of gaan naar een andere runner.",
209 "rui.pauseHelp": "Gepauzeerd: lopende jobs maken af, er worden geen nieuwe opgepakt en BlueGit toont de runner als gepauzeerd.",
210 "rui.active": "Actieve jobs",
211 "rui.recent": "Recente jobs",
212 "rui.noActive": "Er draaien geen jobs.",
213 "rui.noRecent": "Nog geen afgeronde jobs sinds de start.",
214 "rui.col.job": "Job",
215 "rui.col.project": "Project",
216 "rui.col.image": "Image",
217 "rui.col.duration": "Duur",
218 "rui.col.status": "Status",
219 "rui.col.finished": "Klaar",
220 "rui.col.alias": "Alias",
221 "rui.col.base": "Gebaseerd op",
222 "rui.col.kind": "Bron",
223 "rui.pipeline": "pipeline #%d",
224 "rui.job.success": "geslaagd",
225 "rui.job.failed": "mislukt",
226 "rui.job.canceled": "geannuleerd",
227 "rui.settings": "Instellingen",
228 "rui.applyRec": "Aanbevelingen toepassen",
229 "rui.recLead": "★ toont de aanbevolen waarde voor de gevonden hardware. Leeg betekent geen limiet.",
230 "rui.rec": "aanbevolen: %v",
231 "rui.unlimited": "geen limiet",
232 "rui.grp.general": "Algemeen",
233 "rui.grp.capacity": "Capaciteit",
234 "rui.grp.limits": "Limieten per job",
235 "rui.grp.images": "Images en opruimen",
236 "rui.f.name": "Naam",
237 "rui.h.name": "Zichtbaar in BlueGit en in joblogs; wordt bij opslaan naar de server gesynchroniseerd.",
238 "rui.h.nameBuiltin": "Zichtbaar op jobpagina’s en in joblogs. Leeg gebruikt runner.name uit de configuratie.",
239 "rui.f.labels": "Labels",
240 "rui.h.labels": "Gescheiden door komma’s, voor je eigen overzicht (bijv. docker, gpu).",
241 "rui.f.concurrency": "Jobs tegelijk",
242 "rui.f.maxImages": "Maximaal aantal gecachte images",
243 "rui.f.timeout": "Maximale jobduur (minuten)",
244 "rui.h.timeout": "Begrenst de timeout uit de pipeline; leeg volgt de pipeline.",
245 "rui.f.cpus": "CPU’s per job",
246 "rui.f.memory": "Geheugen per job (MB)",
247 "rui.f.pids": "Processen per job",
248 "rui.f.disk": "Schijfbudget (GB)",
249 "rui.h.disk": "images, checkouts en cache samen",
250 "rui.f.pull": "Pull-beleid",
251 "rui.pull.ifNotPresent": "Ophalen als het ontbreekt",
252 "rui.pull.always": "Altijd ophalen",
253 "rui.pull.never": "Nooit ophalen (alleen lokale images)",
254 "rui.h.pull": "Voor gewone images; presets worden altijd lokaal gebouwd.",
255 "rui.f.cleanupWork": "Werkmap na elke job verwijderen",
256 "rui.f.pruneDangling": "Losse (dangling) images opruimen",
257 "rui.f.pruneCache": "Maximale jobcache (GB)",
258 "rui.save": "Instellingen opslaan",
259 "rui.presets": "Image-presets",
260 "rui.presetsLead": "Aliassen zoals bluegit/node die een job als image kan gebruiken. Ingebouwde presets zijn Dockerfiles die bij het eerste gebruik lokaal worden gebouwd; voeg je eigen toe als image of Dockerfile.",
261 "rui.kind.builtin": "ingebouwd",
262 "rui.kind.config": "configbestand",
263 "rui.kind.own": "eigen",
264 "rui.delete": "Verwijderen",
265 "rui.presetDelAsk": "Deze preset verwijderen? Jobs die hem gebruiken mislukken tot je hem weer toevoegt.",
266 "rui.presetAdd": "Preset toevoegen of wijzigen",
267 "rui.presetSave": "Preset opslaan",
268 "rui.f.alias": "Alias",
269 "rui.h.alias": "Kleine letters met een slash, bijv. team/tools. Een ingebouwde naam vervangt die preset.",
270 "rui.f.image": "Image",
271 "rui.h.image": "Gebruik dit image zoals het is (geen bouw). Laat leeg voor een Dockerfile.",
272 "rui.f.from": "Basis-image (FROM)",
273 "rui.h.from": "Vervangt de eerste FROM van de Dockerfile of van een ingebouwde preset.",
274 "rui.f.note": "Notitie",
275 "rui.f.dockerfile": "Dockerfile",
276 "rui.h.dockerfile": "Wordt één keer gebouwd en hergebruikt zolang de Dockerfile gelijk blijft.",
277 "rui.docs": "Documentatie",
278 "rui.docsLead": "Alles hier kan ook via de API:",
279 "rui.ok.saved": "Instellingen opgeslagen.",
280 "rui.ok.recommended": "Aanbevolen waarden toegepast.",
281 "rui.ok.paused": "Runner gepauzeerd. Lopende jobs maken af; nieuwe worden niet opgepakt.",
282 "rui.ok.resumed": "Runner hervat.",
283 "rui.ok.preset": "Preset opgeslagen.",
284 "rui.ok.presetDeleted": "Preset verwijderd.",
285 "rui.err.save": "Opslaan mislukt.",
286 "rui.err.name": "De naam mag letters, cijfers, spaties, punten, streepjes en underscores bevatten (max. 63).",
287 "rui.err.concurrency": "Jobs tegelijk moet tussen 1 en 64 liggen.",
288 "rui.err.images": "Maximaal aantal images moet tussen 1 en 1000 liggen.",
289 "rui.err.limits": "Limieten moeten positieve getallen zijn.",
290 "rui.err.memory": "Geheugen per job moet minstens 64 MB zijn.",
291 "rui.err.pull": "Onbekend pull-beleid.",
292 "rui.err.label": "Ongeldig label: %s",
293 "rui.err.presetDup": "Preset %s staat er twee keer in.",
294 "rui.err.presetEmpty": "Preset %s: geef een image, een Dockerfile of een basis-image.",
295 "rui.err.presetBoth": "Preset %s: een image gaat niet samen met een Dockerfile of basis-image.",
296 "rui.err.presetFrom": "Preset %s: alleen een basis-image kan alleen bij een ingebouwde preset.",
297 "rui.err.presetDockerfile": "Preset %s: de Dockerfile heeft een FROM-regel nodig.",
298 "rui.err.preset": "Preset %s is ongeldig: %s",
299 "rui.nav.overview": "Overzicht",
300 "rui.nav.docs": "Docs",
301 "rui.nav.logout": "Afmelden",
302 "rui.login": "Aanmelden bij de runner",
303 "rui.loginLead": "Gebruik het beheertoken van deze machine. Je ziet het op de machine zelf met:",
304 "rui.loginBad": "Dat token klopt niet.",
305 "rui.token": "Beheertoken",
306 "rui.loginBtn": "Aanmelden",
307 "rdoc.title": "Runnerdocumentatie",
308 "rdoc.intro.h": "Wat deze runner doet",
309 "rdoc.intro.p": "bluegit-runner draait CI-jobs van BlueGit in Docker-containers op deze machine. Hij vraagt de server om werk; de server maakt nooit verbinding met de runner.",
310 "rdoc.network.h": "Netwerk",
311 "rdoc.network.p": "Alleen uitgaand HTTPS (poort 443) naar de BlueGit-server is nodig, plus internet voor images en packages die de jobs ophalen. Er hoeven geen poorten open, ook niet achter NAT.",
312 "rdoc.ui.h": "Deze webinterface",
313 "rdoc.ui.p": "Hij luistert standaard op 127.0.0.1:8765. Wijzig ui_listen in /etc/bluegit-runner/config.yml (of zet hem op off). Meld je aan met het beheertoken uit bluegit-runner ui-token; het staat in de werkmap met mode 0600 en komt nooit in de logs. Gebruik een SSH-tunnel om hem vanaf een andere computer te bereiken.",
314 "rdoc.settings.h": "Instellingen en aanbevelingen",
315 "rdoc.settings.p": "Instellingen staan in settings.json in de werkmap en gelden meteen. Aanbevelingen gaan uit van ongeveer 2 kernen en 2 GB per job, houden 1 kern en 1 GB voor de host en rekenen ongeveer 10 GB schijf per job. Limieten per job worden docker run --cpus, --memory en --pids-limit.",
316 "rdoc.presets.h": "Image-presets",
317 "rdoc.presets.p": "Presets werken zoals bij de ingebouwde runner: image: bluegit/node in een pipeline is een Dockerfile die hier bij het eerste gebruik wordt gebouwd en hergebruikt zolang hij gelijk blijft. Voeg een eigen preset toe als vast image of als Dockerfile, eventueel met een ander basis-image.",
318 "rdoc.pause.h": "Pauze (aflopen)",
319 "rdoc.pause.p": "Pauze laat lopende jobs afmaken en pakt geen nieuwe meer op. BlueGit toont de runner als gepauzeerd en stuurt jobs naar de volgende runner, of laat ze in de wachtrij.",
320 "rdoc.upgrade.h": "Veilig upgraden",
321 "rdoc.upgrade.p": "Pauzeer de runner, wacht tot het overzicht zegt dat upgraden veilig is (geen actieve jobs), upgrade het pakket (bijv. yay -Syu bluegit-runner) en hervat. Een job die halverwege wegvalt, zet de server na 5 minuten zonder contact op mislukt en probeert hem opnieuw als de retry-regels dat toestaan.",
322 "rdoc.api.h": "Lokale API",
323 "rdoc.api.p": "Dezelfde acties zijn er als JSON met het beheertoken als Bearer-token: GET /api/status, GET en PUT /api/settings, GET /api/jobs, POST /api/pause en POST /api/resume.",
324 "rdoc.trouble.h": "Problemen oplossen",
325 "rdoc.trouble.p": "Offline in BlueGit: kijk in journalctl -u bluegit-runner en of HTTPS naar de server werkt. Jobs mislukken met runner_system_failure: controleer docker info als gebruiker bluegit-runner (groep docker). 401 van de server: de runner is ingetrokken; registreer opnieuw. De webinterface opent niet: controleer ui_listen en of niets anders de poort gebruikt.",
326 "rdoc.cmd.h": "Handige commando’s",
327 "rdoc.more": "Volledige documentatie op de server:",
328 }
329
330 var ruiDE = map[string]string{
331 "nav.help": "Hilfe",
332 "nav.adminRunner": "Runner",
333 "title.help": "Hilfe",
334 "help.lead": "Dokumentation zu BlueGit, den Runnern und der API, immer passend zur laufenden Version.",
335 "help.fallback": "Diese Seite gibt es noch nicht in deiner Sprache; sie wird in einer anderen Sprache angezeigt.",
336 "help.otherLang": "andere Sprache",
337 "help.runnerDocs": "Runner-Dokumentation",
338 "help.runners": "Runner",
339 "help.api": "API",
340 "help.what": "Was ist das?",
341 "runner.draining": "auf dem Runner pausiert",
342 "rui.brand": "BlueGit-Runner",
343 "rui.title": "Runner",
344 "rui.lead": "Verwalte diesen bluegit-runner: Kapazität, Limits pro Job, Image-Presets, Pause und laufende Jobs.",
345 "rui.leadBuiltin": "Der eingebaute BlueGit-Runner läuft auf diesem Server. Nur Website-Administratoren können ihn ändern.",
346 "rui.ciOff": "CI ist auf diesem Server deaktiviert.",
347 "rui.state.online": "online",
348 "rui.state.offline": "offline",
349 "rui.state.paused": "pausiert",
350 "rui.state.draining": "läuft aus",
351 "rui.status": "Status",
352 "rui.version": "Version",
353 "rui.server": "Server",
354 "rui.contact": "Letzter Kontakt",
355 "rui.serverPause": "In BlueGit pausiert",
356 "rui.hardware": "Hardware",
357 "rui.hw.cpu": "CPU-Kerne",
358 "rui.hw.mem": "Arbeitsspeicher",
359 "rui.hw.disk": "Festplatte (Arbeitsverzeichnis)",
360 "rui.hw.diskVal": "%d GB frei von %d GB",
361 "rui.upgrade": "Upgrade",
362 "rui.activeCount": "Jobs laufen",
363 "rui.safe": "Sicher zum Upgraden: nichts läuft.",
364 "rui.notSafe": "Noch nicht sicher: Runner pausieren und warten, bis die Jobs fertig sind.",
365 "rui.pause": "Pausieren (auslaufen)",
366 "rui.resume": "Fortsetzen",
367 "rui.pauseAsk": "Diesen Runner pausieren? Laufende Jobs werden fertig, neue warten oder gehen an einen anderen Runner.",
368 "rui.pauseHelp": "Pausiert: laufende Jobs werden fertig, neue werden nicht angenommen und BlueGit zeigt den Runner als pausiert.",
369 "rui.active": "Aktive Jobs",
370 "rui.recent": "Letzte Jobs",
371 "rui.noActive": "Es laufen keine Jobs.",
372 "rui.noRecent": "Seit dem Start keine abgeschlossenen Jobs.",
373 "rui.col.job": "Job",
374 "rui.col.project": "Projekt",
375 "rui.col.image": "Image",
376 "rui.col.duration": "Dauer",
377 "rui.col.status": "Status",
378 "rui.col.finished": "Beendet",
379 "rui.col.alias": "Alias",
380 "rui.col.base": "Basiert auf",
381 "rui.col.kind": "Quelle",
382 "rui.pipeline": "Pipeline #%d",
383 "rui.job.success": "erfolgreich",
384 "rui.job.failed": "fehlgeschlagen",
385 "rui.job.canceled": "abgebrochen",
386 "rui.settings": "Einstellungen",
387 "rui.applyRec": "Empfehlungen übernehmen",
388 "rui.recLead": "★ zeigt den empfohlenen Wert für die erkannte Hardware. Leer bedeutet kein Limit.",
389 "rui.rec": "empfohlen: %v",
390 "rui.unlimited": "kein Limit",
391 "rui.grp.general": "Allgemein",
392 "rui.grp.capacity": "Kapazität",
393 "rui.grp.limits": "Limits pro Job",
394 "rui.grp.images": "Images und Aufräumen",
395 "rui.f.name": "Name",
396 "rui.h.name": "Sichtbar in BlueGit und in Job-Logs; wird beim Speichern an den Server übertragen.",
397 "rui.h.nameBuiltin": "Sichtbar auf Job-Seiten und in Job-Logs. Leer nutzt runner.name aus der Konfiguration.",
398 "rui.f.labels": "Labels",
399 "rui.h.labels": "Durch Kommas getrennt, für die eigene Übersicht (z. B. docker, gpu).",
400 "rui.f.concurrency": "Gleichzeitige Jobs",
401 "rui.f.maxImages": "Maximal zwischengespeicherte Images",
402 "rui.f.timeout": "Maximale Jobdauer (Minuten)",
403 "rui.h.timeout": "Begrenzt das Timeout der Pipeline; leer folgt der Pipeline.",
404 "rui.f.cpus": "CPUs pro Job",
405 "rui.f.memory": "Speicher pro Job (MB)",
406 "rui.f.pids": "Prozesse pro Job",
407 "rui.f.disk": "Festplattenbudget (GB)",
408 "rui.h.disk": "Images, Checkouts und Cache zusammen",
409 "rui.f.pull": "Pull-Richtlinie",
410 "rui.pull.ifNotPresent": "Holen, wenn es fehlt",
411 "rui.pull.always": "Immer holen",
412 "rui.pull.never": "Nie holen (nur lokale Images)",
413 "rui.h.pull": "Für normale Images; Presets werden immer lokal gebaut.",
414 "rui.f.cleanupWork": "Arbeitsverzeichnis nach jedem Job löschen",
415 "rui.f.pruneDangling": "Verwaiste Images entfernen",
416 "rui.f.pruneCache": "Maximaler Job-Cache (GB)",
417 "rui.save": "Einstellungen speichern",
418 "rui.presets": "Image-Presets",
419 "rui.presetsLead": "Aliase wie bluegit/node, die ein Job als Image nutzen kann. Eingebaute Presets sind Dockerfiles, die beim ersten Einsatz lokal gebaut werden; eigene als Image oder Dockerfile hinzufügen.",
420 "rui.kind.builtin": "eingebaut",
421 "rui.kind.config": "Konfigurationsdatei",
422 "rui.kind.own": "eigenes",
423 "rui.delete": "Löschen",
424 "rui.presetDelAsk": "Dieses Preset löschen? Jobs, die es nutzen, schlagen fehl, bis du es wieder hinzufügst.",
425 "rui.presetAdd": "Preset hinzufügen oder ändern",
426 "rui.presetSave": "Preset speichern",
427 "rui.f.alias": "Alias",
428 "rui.h.alias": "Kleinbuchstaben mit Schrägstrich, z. B. team/tools. Ein eingebauter Name ersetzt dieses Preset.",
429 "rui.f.image": "Image",
430 "rui.h.image": "Dieses Image unverändert nutzen (kein Build). Für ein Dockerfile leer lassen.",
431 "rui.f.from": "Basis-Image (FROM)",
432 "rui.h.from": "Ersetzt das erste FROM des Dockerfiles oder eines eingebauten Presets.",
433 "rui.f.note": "Notiz",
434 "rui.f.dockerfile": "Dockerfile",
435 "rui.h.dockerfile": "Wird einmal gebaut und wiederverwendet, solange das Dockerfile gleich bleibt.",
436 "rui.docs": "Dokumentation",
437 "rui.docsLead": "Alles hier geht auch über die API:",
438 "rui.ok.saved": "Einstellungen gespeichert.",
439 "rui.ok.recommended": "Empfohlene Werte übernommen.",
440 "rui.ok.paused": "Runner pausiert. Laufende Jobs werden fertig; neue werden nicht angenommen.",
441 "rui.ok.resumed": "Runner fortgesetzt.",
442 "rui.ok.preset": "Preset gespeichert.",
443 "rui.ok.presetDeleted": "Preset gelöscht.",
444 "rui.err.save": "Speichern fehlgeschlagen.",
445 "rui.err.name": "Der Name darf Buchstaben, Ziffern, Leerzeichen, Punkte, Binde- und Unterstriche enthalten (max. 63).",
446 "rui.err.concurrency": "Gleichzeitige Jobs müssen zwischen 1 und 64 liegen.",
447 "rui.err.images": "Maximale Images müssen zwischen 1 und 1000 liegen.",
448 "rui.err.limits": "Limits müssen positive Zahlen sein.",
449 "rui.err.memory": "Speicher pro Job muss mindestens 64 MB sein.",
450 "rui.err.pull": "Unbekannte Pull-Richtlinie.",
451 "rui.err.label": "Ungültiges Label: %s",
452 "rui.err.presetDup": "Preset %s kommt doppelt vor.",
453 "rui.err.presetEmpty": "Preset %s: Image, Dockerfile oder Basis-Image angeben.",
454 "rui.err.presetBoth": "Preset %s: Ein Image lässt sich nicht mit Dockerfile oder Basis-Image kombinieren.",
455 "rui.err.presetFrom": "Preset %s: Nur ein Basis-Image geht nur bei einem eingebauten Preset.",
456 "rui.err.presetDockerfile": "Preset %s: Das Dockerfile braucht eine FROM-Zeile.",
457 "rui.err.preset": "Preset %s ist ungültig: %s",
458 "rui.nav.overview": "Übersicht",
459 "rui.nav.docs": "Doku",
460 "rui.nav.logout": "Abmelden",
461 "rui.login": "Am Runner anmelden",
462 "rui.loginLead": "Nutze das Admin-Token dieser Maschine. Anzeigen auf der Maschine selbst mit:",
463 "rui.loginBad": "Dieses Token ist nicht korrekt.",
464 "rui.token": "Admin-Token",
465 "rui.loginBtn": "Anmelden",
466 "rdoc.title": "Runner-Dokumentation",
467 "rdoc.intro.h": "Was dieser Runner macht",
468 "rdoc.intro.p": "bluegit-runner führt CI-Jobs aus BlueGit in Docker-Containern auf dieser Maschine aus. Er fragt den Server nach Arbeit; der Server verbindet sich nie mit dem Runner.",
469 "rdoc.network.h": "Netzwerk",
470 "rdoc.network.p": "Nötig ist nur ausgehendes HTTPS (Port 443) zum BlueGit-Server sowie Internet für Images und Pakete der Jobs. Es müssen keine Ports geöffnet werden, auch nicht hinter NAT.",
471 "rdoc.ui.h": "Diese Weboberfläche",
472 "rdoc.ui.p": "Standardmäßig lauscht sie auf 127.0.0.1:8765. Ändere ui_listen in /etc/bluegit-runner/config.yml (oder setze off). Anmeldung mit dem Admin-Token aus bluegit-runner ui-token; es liegt mit Modus 0600 im Arbeitsverzeichnis und landet nie in den Logs. Von einem anderen Rechner per SSH-Tunnel erreichen.",
473 "rdoc.settings.h": "Einstellungen und Empfehlungen",
474 "rdoc.settings.p": "Einstellungen liegen in settings.json im Arbeitsverzeichnis und gelten sofort. Empfehlungen rechnen mit etwa 2 Kernen und 2 GB pro Job, lassen 1 Kern und 1 GB für den Host und etwa 10 GB Platte pro Job. Limits pro Job werden zu docker run --cpus, --memory und --pids-limit.",
475 "rdoc.presets.h": "Image-Presets",
476 "rdoc.presets.p": "Presets funktionieren wie beim eingebauten Runner: image: bluegit/node in einer Pipeline ist ein Dockerfile, das hier beim ersten Einsatz gebaut und wiederverwendet wird, solange es gleich bleibt. Eigene Presets als festes Image oder Dockerfile, optional mit anderem Basis-Image.",
477 "rdoc.pause.h": "Pause (auslaufen)",
478 "rdoc.pause.p": "Die Pause lässt laufende Jobs fertig werden und nimmt keine neuen an. BlueGit zeigt den Runner als pausiert und schickt Jobs an den nächsten Runner oder lässt sie warten.",
479 "rdoc.upgrade.h": "Sicher upgraden",
480 "rdoc.upgrade.p": "Runner pausieren, warten bis die Übersicht ein sicheres Upgrade meldet (keine aktiven Jobs), Paket aktualisieren (z. B. yay -Syu bluegit-runner) und fortsetzen. Ein mittendrin abgebrochener Job wird vom Server nach 5 Minuten ohne Kontakt als fehlgeschlagen markiert und gemäß Retry-Regeln wiederholt.",
481 "rdoc.api.h": "Lokale API",
482 "rdoc.api.p": "Dieselben Aktionen gibt es als JSON mit dem Admin-Token als Bearer-Token: GET /api/status, GET und PUT /api/settings, GET /api/jobs, POST /api/pause und POST /api/resume.",
483 "rdoc.trouble.h": "Fehlerbehebung",
484 "rdoc.trouble.p": "Offline in BlueGit: journalctl -u bluegit-runner prüfen und ob HTTPS zum Server geht. Jobs scheitern mit runner_system_failure: docker info als Benutzer bluegit-runner prüfen (Gruppe docker). 401 vom Server: Runner wurde widerrufen; neu registrieren. Weboberfläche öffnet nicht: ui_listen prüfen und ob der Port belegt ist.",
485 "rdoc.cmd.h": "Nützliche Befehle",
486 "rdoc.more": "Vollständige Dokumentation auf dem Server:",
487 }
488
489 var ruiFR = map[string]string{
490 "nav.help": "Aide",
491 "nav.adminRunner": "Runner",
492 "title.help": "Aide",
493 "help.lead": "Documentation de BlueGit, des runners et de l’API, toujours alignée sur la version en service.",
494 "help.fallback": "Cette page n’existe pas encore dans ta langue ; elle s’affiche dans une autre langue.",
495 "help.otherLang": "autre langue",
496 "help.runnerDocs": "Documentation des runners",
497 "help.runners": "Runners",
498 "help.api": "API",
499 "help.what": "Qu’est-ce que c’est ?",
500 "runner.draining": "en pause sur le runner",
501 "rui.brand": "Runner BlueGit",
502 "rui.title": "Runner",
503 "rui.lead": "Gère ce bluegit-runner : capacité, limites par job, presets d’images, pause et jobs en cours.",
504 "rui.leadBuiltin": "Le runner BlueGit intégré tourne sur ce serveur. Seuls les administrateurs du site peuvent le modifier.",
505 "rui.ciOff": "La CI est désactivée sur ce serveur.",
506 "rui.state.online": "en ligne",
507 "rui.state.offline": "hors ligne",
508 "rui.state.paused": "en pause",
509 "rui.state.draining": "en vidange",
510 "rui.status": "État",
511 "rui.version": "Version",
512 "rui.server": "Serveur",
513 "rui.contact": "Dernier contact",
514 "rui.serverPause": "En pause dans BlueGit",
515 "rui.hardware": "Matériel",
516 "rui.hw.cpu": "Cœurs CPU",
517 "rui.hw.mem": "Mémoire",
518 "rui.hw.disk": "Disque (dossier de travail)",
519 "rui.hw.diskVal": "%d Go libres sur %d Go",
520 "rui.upgrade": "Mise à jour",
521 "rui.activeCount": "jobs en cours",
522 "rui.safe": "Mise à jour sans risque : rien ne tourne.",
523 "rui.notSafe": "Pas encore : mets le runner en pause et attends la fin des jobs.",
524 "rui.pause": "Pause (vidange)",
525 "rui.resume": "Reprendre",
526 "rui.pauseAsk": "Mettre ce runner en pause ? Les jobs en cours se terminent, les nouveaux attendent ou vont à un autre runner.",
527 "rui.pauseHelp": "En pause : les jobs en cours se terminent, aucun nouveau n’est pris et BlueGit affiche le runner en pause.",
528 "rui.active": "Jobs actifs",
529 "rui.recent": "Jobs récents",
530 "rui.noActive": "Aucun job en cours.",
531 "rui.noRecent": "Aucun job terminé depuis le démarrage.",
532 "rui.col.job": "Job",
533 "rui.col.project": "Projet",
534 "rui.col.image": "Image",
535 "rui.col.duration": "Durée",
536 "rui.col.status": "État",
537 "rui.col.finished": "Terminé",
538 "rui.col.alias": "Alias",
539 "rui.col.base": "Basé sur",
540 "rui.col.kind": "Source",
541 "rui.pipeline": "pipeline #%d",
542 "rui.job.success": "réussi",
543 "rui.job.failed": "échoué",
544 "rui.job.canceled": "annulé",
545 "rui.settings": "Paramètres",
546 "rui.applyRec": "Appliquer les recommandations",
547 "rui.recLead": "★ indique la valeur recommandée pour le matériel détecté. Vide signifie sans limite.",
548 "rui.rec": "recommandé : %v",
549 "rui.unlimited": "sans limite",
550 "rui.grp.general": "Général",
551 "rui.grp.capacity": "Capacité",
552 "rui.grp.limits": "Limites par job",
553 "rui.grp.images": "Images et nettoyage",
554 "rui.f.name": "Nom",
555 "rui.h.name": "Visible dans BlueGit et dans les journaux ; synchronisé avec le serveur à l’enregistrement.",
556 "rui.h.nameBuiltin": "Visible sur les pages de job et dans les journaux. Vide utilise runner.name de la configuration.",
557 "rui.f.labels": "Étiquettes",
558 "rui.h.labels": "Séparées par des virgules, pour ton propre suivi (par ex. docker, gpu).",
559 "rui.f.concurrency": "Jobs simultanés",
560 "rui.f.maxImages": "Images en cache au maximum",
561 "rui.f.timeout": "Durée maximale d’un job (minutes)",
562 "rui.h.timeout": "Plafonne le délai de la pipeline ; vide suit la pipeline.",
563 "rui.f.cpus": "CPU par job",
564 "rui.f.memory": "Mémoire par job (Mo)",
565 "rui.f.pids": "Processus par job",
566 "rui.f.disk": "Budget disque (Go)",
567 "rui.h.disk": "images, checkouts et cache ensemble",
568 "rui.f.pull": "Politique de pull",
569 "rui.pull.ifNotPresent": "Récupérer si absente",
570 "rui.pull.always": "Toujours récupérer",
571 "rui.pull.never": "Jamais (images locales uniquement)",
572 "rui.h.pull": "Pour les images normales ; les presets sont toujours construits localement.",
573 "rui.f.cleanupWork": "Supprimer le dossier de travail après chaque job",
574 "rui.f.pruneDangling": "Supprimer les images orphelines",
575 "rui.f.pruneCache": "Cache des jobs maximal (Go)",
576 "rui.save": "Enregistrer",
577 "rui.presets": "Presets d’images",
578 "rui.presetsLead": "Alias comme bluegit/node qu’un job peut utiliser comme image. Les presets intégrés sont des Dockerfiles construits localement au premier usage ; ajoute les tiens comme image ou Dockerfile.",
579 "rui.kind.builtin": "intégré",
580 "rui.kind.config": "fichier de config",
581 "rui.kind.own": "personnel",
582 "rui.delete": "Supprimer",
583 "rui.presetDelAsk": "Supprimer ce preset ? Les jobs qui l’utilisent échoueront jusqu’à ce que tu le rajoutes.",
584 "rui.presetAdd": "Ajouter ou modifier un preset",
585 "rui.presetSave": "Enregistrer le preset",
586 "rui.f.alias": "Alias",
587 "rui.h.alias": "En minuscules avec une barre, par ex. team/tools. Un nom intégré remplace ce preset.",
588 "rui.f.image": "Image",
589 "rui.h.image": "Utiliser cette image telle quelle (sans build). Laisser vide pour un Dockerfile.",
590 "rui.f.from": "Image de base (FROM)",
591 "rui.h.from": "Remplace le premier FROM du Dockerfile ou d’un preset intégré.",
592 "rui.f.note": "Note",
593 "rui.f.dockerfile": "Dockerfile",
594 "rui.h.dockerfile": "Construit une fois et réutilisé tant que le Dockerfile ne change pas.",
595 "rui.docs": "Documentation",
596 "rui.docsLead": "Tout ceci est aussi disponible via l’API :",
597 "rui.ok.saved": "Paramètres enregistrés.",
598 "rui.ok.recommended": "Valeurs recommandées appliquées.",
599 "rui.ok.paused": "Runner en pause. Les jobs en cours se terminent ; aucun nouveau n’est pris.",
600 "rui.ok.resumed": "Runner repris.",
601 "rui.ok.preset": "Preset enregistré.",
602 "rui.ok.presetDeleted": "Preset supprimé.",
603 "rui.err.save": "Échec de l’enregistrement.",
604 "rui.err.name": "Le nom peut contenir lettres, chiffres, espaces, points, tirets et soulignés (63 max.).",
605 "rui.err.concurrency": "Les jobs simultanés doivent être entre 1 et 64.",
606 "rui.err.images": "Le nombre d’images doit être entre 1 et 1000.",
607 "rui.err.limits": "Les limites doivent être des nombres positifs.",
608 "rui.err.memory": "La mémoire par job doit être d’au moins 64 Mo.",
609 "rui.err.pull": "Politique de pull inconnue.",
610 "rui.err.label": "Étiquette invalide : %s",
611 "rui.err.presetDup": "Le preset %s apparaît deux fois.",
612 "rui.err.presetEmpty": "Preset %s : indique une image, un Dockerfile ou une image de base.",
613 "rui.err.presetBoth": "Preset %s : une image ne se combine pas avec un Dockerfile ou une image de base.",
614 "rui.err.presetFrom": "Preset %s : une image de base seule ne vaut que pour un preset intégré.",
615 "rui.err.presetDockerfile": "Preset %s : le Dockerfile doit contenir une ligne FROM.",
616 "rui.err.preset": "Le preset %s est invalide : %s",
617 "rui.nav.overview": "Aperçu",
618 "rui.nav.docs": "Docs",
619 "rui.nav.logout": "Se déconnecter",
620 "rui.login": "Connexion au runner",
621 "rui.loginLead": "Utilise le jeton d’administration de cette machine. Affiche-le sur la machine avec :",
622 "rui.loginBad": "Ce jeton est incorrect.",
623 "rui.token": "Jeton d’administration",
624 "rui.loginBtn": "Se connecter",
625 "rdoc.title": "Documentation du runner",
626 "rdoc.intro.h": "Ce que fait ce runner",
627 "rdoc.intro.p": "bluegit-runner exécute les jobs CI de BlueGit dans des conteneurs Docker sur cette machine. Il demande du travail au serveur ; le serveur ne se connecte jamais au runner.",
628 "rdoc.network.h": "Réseau",
629 "rdoc.network.p": "Seul le HTTPS sortant (port 443) vers le serveur BlueGit est nécessaire, plus Internet pour les images et paquets des jobs. Aucun port à ouvrir, même derrière un NAT.",
630 "rdoc.ui.h": "Cette interface web",
631 "rdoc.ui.p": "Elle écoute par défaut sur 127.0.0.1:8765. Modifie ui_listen dans /etc/bluegit-runner/config.yml (ou mets off). Connecte-toi avec le jeton de bluegit-runner ui-token ; il est stocké dans le dossier de travail en mode 0600 et n’apparaît jamais dans les journaux. Utilise un tunnel SSH depuis un autre ordinateur.",
632 "rdoc.settings.h": "Paramètres et recommandations",
633 "rdoc.settings.p": "Les paramètres sont dans settings.json du dossier de travail et s’appliquent tout de suite. Les recommandations comptent environ 2 cœurs et 2 Go par job, gardent 1 cœur et 1 Go pour l’hôte et environ 10 Go de disque par job. Les limites deviennent docker run --cpus, --memory et --pids-limit.",
634 "rdoc.presets.h": "Presets d’images",
635 "rdoc.presets.p": "Les presets fonctionnent comme sur le runner intégré : image: bluegit/node dans une pipeline est un Dockerfile construit ici au premier usage et réutilisé tant qu’il ne change pas. Ajoute ton preset comme image fixe ou Dockerfile, avec éventuellement une autre image de base.",
636 "rdoc.pause.h": "Pause (vidange)",
637 "rdoc.pause.p": "La pause laisse finir les jobs en cours et n’en prend plus de nouveaux. BlueGit affiche le runner en pause et envoie les jobs au runner suivant, ou les garde en file.",
638 "rdoc.upgrade.h": "Mettre à jour sans risque",
639 "rdoc.upgrade.p": "Mets le runner en pause, attends que l’aperçu indique une mise à jour sans risque (aucun job actif), mets à jour le paquet (par ex. yay -Syu bluegit-runner) puis reprends. Un job coupé en cours est marqué échoué par le serveur après 5 minutes sans contact et relancé si les règles de retry le permettent.",
640 "rdoc.api.h": "API locale",
641 "rdoc.api.p": "Les mêmes actions existent en JSON avec le jeton d’administration en Bearer : GET /api/status, GET et PUT /api/settings, GET /api/jobs, POST /api/pause et POST /api/resume.",
642 "rdoc.trouble.h": "Dépannage",
643 "rdoc.trouble.p": "Hors ligne dans BlueGit : vérifie journalctl -u bluegit-runner et que le HTTPS vers le serveur passe. Jobs en runner_system_failure : vérifie docker info en tant que bluegit-runner (groupe docker). 401 du serveur : le runner a été révoqué ; réenregistre-le. L’interface ne s’ouvre pas : vérifie ui_listen et que le port est libre.",
644 "rdoc.cmd.h": "Commandes utiles",
645 "rdoc.more": "Documentation complète sur le serveur :",
646 }
@@ -0,0 +1,646 @@
1// Code gegenereerd door tools/gen/cat.py; vertalingen voor /help, /admin/runner
2// en de webinterface van bluegit-runner.
3package i18n
4
5func init() {
6 addCatalog(en, ruiEN)
7 addCatalog(nl, ruiNL)
8 addCatalog(de, ruiDE)
9 addCatalog(fr, ruiFR)
10}
11
12var ruiEN = map[string]string{
13 "nav.help": "Help",
14 "nav.adminRunner": "Runner",
15 "title.help": "Help",
16 "help.lead": "Documentation for BlueGit, its runners and the API, always matching the running version.",
17 "help.fallback": "This page is not available in your language yet; it is shown in another language.",
18 "help.otherLang": "other language",
19 "help.runnerDocs": "Runner documentation",
20 "help.runners": "Runners",
21 "help.api": "API",
22 "help.what": "What is this?",
23 "runner.draining": "paused on the runner",
24 "rui.brand": "BlueGit runner",
25 "rui.title": "Runner",
26 "rui.lead": "Manage this bluegit-runner: capacity, limits per job, image presets, pause and the jobs it is running.",
27 "rui.leadBuiltin": "The built-in BlueGit runner runs on this server. Only site administrators can change it.",
28 "rui.ciOff": "CI is disabled on this server.",
29 "rui.state.online": "online",
30 "rui.state.offline": "offline",
31 "rui.state.paused": "paused",
32 "rui.state.draining": "draining",
33 "rui.status": "Status",
34 "rui.version": "Version",
35 "rui.server": "Server",
36 "rui.contact": "Last contact",
37 "rui.serverPause": "Paused in BlueGit",
38 "rui.hardware": "Hardware",
39 "rui.hw.cpu": "CPU cores",
40 "rui.hw.mem": "Memory",
41 "rui.hw.disk": "Disk (work dir)",
42 "rui.hw.diskVal": "%d GB free of %d GB",
43 "rui.upgrade": "Upgrade",
44 "rui.activeCount": "jobs running",
45 "rui.safe": "Safe to upgrade: nothing is running.",
46 "rui.notSafe": "Not safe yet: pause the runner and wait until the jobs are done.",
47 "rui.pause": "Pause (drain)",
48 "rui.resume": "Resume",
49 "rui.pauseAsk": "Pause this runner? Running jobs finish, new jobs wait or go to another runner.",
50 "rui.pauseHelp": "Paused: running jobs finish, no new jobs are picked up and BlueGit shows the runner as paused.",
51 "rui.active": "Active jobs",
52 "rui.recent": "Recent jobs",
53 "rui.noActive": "No jobs are running.",
54 "rui.noRecent": "No finished jobs since the runner started.",
55 "rui.col.job": "Job",
56 "rui.col.project": "Project",
57 "rui.col.image": "Image",
58 "rui.col.duration": "Duration",
59 "rui.col.status": "Status",
60 "rui.col.finished": "Finished",
61 "rui.col.alias": "Alias",
62 "rui.col.base": "Based on",
63 "rui.col.kind": "Source",
64 "rui.pipeline": "pipeline #%d",
65 "rui.job.success": "passed",
66 "rui.job.failed": "failed",
67 "rui.job.canceled": "canceled",
68 "rui.settings": "Settings",
69 "rui.applyRec": "Apply recommendations",
70 "rui.recLead": "★ shows the recommended value for the detected hardware. Empty means no limit.",
71 "rui.rec": "recommended: %v",
72 "rui.unlimited": "no limit",
73 "rui.grp.general": "General",
74 "rui.grp.capacity": "Capacity",
75 "rui.grp.limits": "Limits per job",
76 "rui.grp.images": "Images and cleanup",
77 "rui.f.name": "Name",
78 "rui.h.name": "Shown in BlueGit and in job logs; synced to the server on save.",
79 "rui.h.nameBuiltin": "Shown on job pages and in job logs. Empty uses runner.name from the configuration.",
80 "rui.f.labels": "Labels",
81 "rui.h.labels": "Comma separated, for your own overview (for example docker, gpu).",
82 "rui.f.concurrency": "Jobs at the same time",
83 "rui.f.maxImages": "Maximum cached images",
84 "rui.f.timeout": "Maximum job duration (minutes)",
85 "rui.h.timeout": "Caps the timeout from the pipeline; empty follows the pipeline.",
86 "rui.f.cpus": "CPUs per job",
87 "rui.f.memory": "Memory per job (MB)",
88 "rui.f.pids": "Processes per job",
89 "rui.f.disk": "Disk budget (GB)",
90 "rui.h.disk": "images, checkouts and cache together",
91 "rui.f.pull": "Pull policy",
92 "rui.pull.ifNotPresent": "Pull when missing",
93 "rui.pull.always": "Always pull",
94 "rui.pull.never": "Never pull (local images only)",
95 "rui.h.pull": "For normal images; presets are always built locally.",
96 "rui.f.cleanupWork": "Remove the work directory after each job",
97 "rui.f.pruneDangling": "Remove dangling images",
98 "rui.f.pruneCache": "Maximum job cache (GB)",
99 "rui.save": "Save settings",
100 "rui.presets": "Image presets",
101 "rui.presetsLead": "Aliases such as bluegit/node that a job can use as image. Built-in presets are Dockerfiles that are built locally on first use; add your own as an image or a Dockerfile.",
102 "rui.kind.builtin": "built-in",
103 "rui.kind.config": "config file",
104 "rui.kind.own": "own",
105 "rui.delete": "Delete",
106 "rui.presetDelAsk": "Delete this preset? Jobs that use it fail until you add it again.",
107 "rui.presetAdd": "Add or change a preset",
108 "rui.presetSave": "Save preset",
109 "rui.f.alias": "Alias",
110 "rui.h.alias": "Lowercase with a slash, for example team/tools. A built-in name replaces that preset.",
111 "rui.f.image": "Image",
112 "rui.h.image": "Use this image as is (no build). Leave empty for a Dockerfile.",
113 "rui.f.from": "Base image (FROM)",
114 "rui.h.from": "Replaces the first FROM of the Dockerfile or of a built-in preset.",
115 "rui.f.note": "Note",
116 "rui.f.dockerfile": "Dockerfile",
117 "rui.h.dockerfile": "Built once and reused while the Dockerfile stays the same.",
118 "rui.docs": "Documentation",
119 "rui.docsLead": "Everything here is also available through the API:",
120 "rui.ok.saved": "Settings saved.",
121 "rui.ok.recommended": "Recommended values applied.",
122 "rui.ok.paused": "Runner paused. Running jobs finish; new jobs are not picked up.",
123 "rui.ok.resumed": "Runner resumed.",
124 "rui.ok.preset": "Preset saved.",
125 "rui.ok.presetDeleted": "Preset deleted.",
126 "rui.err.save": "Saving failed.",
127 "rui.err.name": "The name may contain letters, digits, spaces, dots, dashes and underscores (max. 63).",
128 "rui.err.concurrency": "Jobs at the same time must be between 1 and 64.",
129 "rui.err.images": "Maximum cached images must be between 1 and 1000.",
130 "rui.err.limits": "Limits must be positive numbers.",
131 "rui.err.memory": "Memory per job must be at least 64 MB.",
132 "rui.err.pull": "Unknown pull policy.",
133 "rui.err.label": "Invalid label: %s",
134 "rui.err.presetDup": "Preset %s appears twice.",
135 "rui.err.presetEmpty": "Preset %s: give an image, a Dockerfile or a base image.",
136 "rui.err.presetBoth": "Preset %s: an image cannot be combined with a Dockerfile or base image.",
137 "rui.err.presetFrom": "Preset %s: a base image alone only works for a built-in preset.",
138 "rui.err.presetDockerfile": "Preset %s: the Dockerfile needs a FROM line.",
139 "rui.err.preset": "Preset %s is invalid: %s",
140 "rui.nav.overview": "Overview",
141 "rui.nav.docs": "Docs",
142 "rui.nav.logout": "Sign out",
143 "rui.login": "Sign in to the runner",
144 "rui.loginLead": "Use the admin token of this machine. Show it on the machine itself with:",
145 "rui.loginBad": "That token is not correct.",
146 "rui.token": "Admin token",
147 "rui.loginBtn": "Sign in",
148 "rdoc.title": "Runner documentation",
149 "rdoc.intro.h": "What this runner does",
150 "rdoc.intro.p": "bluegit-runner runs CI jobs from BlueGit in Docker containers on this machine. It asks the server for work; the server never connects to the runner.",
151 "rdoc.network.h": "Network",
152 "rdoc.network.p": "Only outgoing HTTPS (port 443) to the BlueGit server is needed, plus internet access for images and packages the jobs fetch. No ports have to be opened, also not behind NAT.",
153 "rdoc.ui.h": "This web interface",
154 "rdoc.ui.p": "It listens on 127.0.0.1:8765 by default. Change ui_listen in /etc/bluegit-runner/config.yml (or set it to off). Sign in with the admin token from bluegit-runner ui-token; it is stored in the work directory with mode 0600 and never written to the logs. Use an SSH tunnel to reach it from another computer.",
155 "rdoc.settings.h": "Settings and recommendations",
156 "rdoc.settings.p": "Settings are stored in settings.json in the work directory and apply immediately. Recommendations assume about 2 cores and 2 GB per job, keep 1 core and 1 GB for the host and about 10 GB of disk per job. Limits per job become docker run --cpus, --memory and --pids-limit.",
157 "rdoc.presets.h": "Image presets",
158 "rdoc.presets.p": "Presets work like on the built-in runner: image: bluegit/node in a pipeline is a Dockerfile that is built here on first use and reused while it stays the same. Add your own preset as a fixed image or as a Dockerfile, optionally with another base image.",
159 "rdoc.pause.h": "Pause (drain)",
160 "rdoc.pause.p": "Pause lets running jobs finish and stops picking up new ones. BlueGit shows the runner as paused and sends its jobs to the next runner in line, or keeps them queued.",
161 "rdoc.upgrade.h": "Upgrading safely",
162 "rdoc.upgrade.p": "Pause the runner, wait until the overview says it is safe to upgrade (no active jobs), upgrade the package (for example yay -Syu bluegit-runner) and resume. A job that is cut off mid-run is marked failed by the server after 5 minutes without contact and retried when its retry rules allow it.",
163 "rdoc.api.h": "Local API",
164 "rdoc.api.p": "The same actions are available as JSON with the admin token as Bearer token: GET /api/status, GET and PUT /api/settings, GET /api/jobs, POST /api/pause and POST /api/resume.",
165 "rdoc.trouble.h": "Troubleshooting",
166 "rdoc.trouble.p": "Offline in BlueGit: check journalctl -u bluegit-runner and whether HTTPS to the server works. Jobs fail with runner_system_failure: check docker info as the bluegit-runner user (group docker). 401 from the server: the runner was revoked; register again. The web interface does not open: check ui_listen and that nothing else uses the port.",
167 "rdoc.cmd.h": "Useful commands",
168 "rdoc.more": "Full documentation on the server:",
169}
170
171var ruiNL = map[string]string{
172 "nav.help": "Help",
173 "nav.adminRunner": "Runner",
174 "title.help": "Help",
175 "help.lead": "Documentatie voor BlueGit, de runners en de API, altijd passend bij de draaiende versie.",
176 "help.fallback": "Deze pagina is nog niet in je taal beschikbaar en wordt in een andere taal getoond.",
177 "help.otherLang": "andere taal",
178 "help.runnerDocs": "Runnerdocumentatie",
179 "help.runners": "Runners",
180 "help.api": "API",
181 "help.what": "Wat is dit?",
182 "runner.draining": "gepauzeerd op de runner",
183 "rui.brand": "BlueGit-runner",
184 "rui.title": "Runner",
185 "rui.lead": "Beheer deze bluegit-runner: capaciteit, limieten per job, image-presets, pauze en de jobs die hij draait.",
186 "rui.leadBuiltin": "De ingebouwde BlueGit-runner draait op deze server. Alleen sitebeheerders kunnen hem aanpassen.",
187 "rui.ciOff": "CI staat uit op deze server.",
188 "rui.state.online": "online",
189 "rui.state.offline": "offline",
190 "rui.state.paused": "gepauzeerd",
191 "rui.state.draining": "loopt af",
192 "rui.status": "Status",
193 "rui.version": "Versie",
194 "rui.server": "Server",
195 "rui.contact": "Laatste contact",
196 "rui.serverPause": "Gepauzeerd in BlueGit",
197 "rui.hardware": "Hardware",
198 "rui.hw.cpu": "CPU-kernen",
199 "rui.hw.mem": "Geheugen",
200 "rui.hw.disk": "Schijf (werkmap)",
201 "rui.hw.diskVal": "%d GB vrij van %d GB",
202 "rui.upgrade": "Upgraden",
203 "rui.activeCount": "jobs bezig",
204 "rui.safe": "Veilig om te upgraden: er draait niets.",
205 "rui.notSafe": "Nog niet veilig: pauzeer de runner en wacht tot de jobs klaar zijn.",
206 "rui.pause": "Pauzeren (aflopen)",
207 "rui.resume": "Hervatten",
208 "rui.pauseAsk": "Deze runner pauzeren? Lopende jobs maken af, nieuwe wachten of gaan naar een andere runner.",
209 "rui.pauseHelp": "Gepauzeerd: lopende jobs maken af, er worden geen nieuwe opgepakt en BlueGit toont de runner als gepauzeerd.",
210 "rui.active": "Actieve jobs",
211 "rui.recent": "Recente jobs",
212 "rui.noActive": "Er draaien geen jobs.",
213 "rui.noRecent": "Nog geen afgeronde jobs sinds de start.",
214 "rui.col.job": "Job",
215 "rui.col.project": "Project",
216 "rui.col.image": "Image",
217 "rui.col.duration": "Duur",
218 "rui.col.status": "Status",
219 "rui.col.finished": "Klaar",
220 "rui.col.alias": "Alias",
221 "rui.col.base": "Gebaseerd op",
222 "rui.col.kind": "Bron",
223 "rui.pipeline": "pipeline #%d",
224 "rui.job.success": "geslaagd",
225 "rui.job.failed": "mislukt",
226 "rui.job.canceled": "geannuleerd",
227 "rui.settings": "Instellingen",
228 "rui.applyRec": "Aanbevelingen toepassen",
229 "rui.recLead": "★ toont de aanbevolen waarde voor de gevonden hardware. Leeg betekent geen limiet.",
230 "rui.rec": "aanbevolen: %v",
231 "rui.unlimited": "geen limiet",
232 "rui.grp.general": "Algemeen",
233 "rui.grp.capacity": "Capaciteit",
234 "rui.grp.limits": "Limieten per job",
235 "rui.grp.images": "Images en opruimen",
236 "rui.f.name": "Naam",
237 "rui.h.name": "Zichtbaar in BlueGit en in joblogs; wordt bij opslaan naar de server gesynchroniseerd.",
238 "rui.h.nameBuiltin": "Zichtbaar op jobpagina’s en in joblogs. Leeg gebruikt runner.name uit de configuratie.",
239 "rui.f.labels": "Labels",
240 "rui.h.labels": "Gescheiden door komma’s, voor je eigen overzicht (bijv. docker, gpu).",
241 "rui.f.concurrency": "Jobs tegelijk",
242 "rui.f.maxImages": "Maximaal aantal gecachte images",
243 "rui.f.timeout": "Maximale jobduur (minuten)",
244 "rui.h.timeout": "Begrenst de timeout uit de pipeline; leeg volgt de pipeline.",
245 "rui.f.cpus": "CPU’s per job",
246 "rui.f.memory": "Geheugen per job (MB)",
247 "rui.f.pids": "Processen per job",
248 "rui.f.disk": "Schijfbudget (GB)",
249 "rui.h.disk": "images, checkouts en cache samen",
250 "rui.f.pull": "Pull-beleid",
251 "rui.pull.ifNotPresent": "Ophalen als het ontbreekt",
252 "rui.pull.always": "Altijd ophalen",
253 "rui.pull.never": "Nooit ophalen (alleen lokale images)",
254 "rui.h.pull": "Voor gewone images; presets worden altijd lokaal gebouwd.",
255 "rui.f.cleanupWork": "Werkmap na elke job verwijderen",
256 "rui.f.pruneDangling": "Losse (dangling) images opruimen",
257 "rui.f.pruneCache": "Maximale jobcache (GB)",
258 "rui.save": "Instellingen opslaan",
259 "rui.presets": "Image-presets",
260 "rui.presetsLead": "Aliassen zoals bluegit/node die een job als image kan gebruiken. Ingebouwde presets zijn Dockerfiles die bij het eerste gebruik lokaal worden gebouwd; voeg je eigen toe als image of Dockerfile.",
261 "rui.kind.builtin": "ingebouwd",
262 "rui.kind.config": "configbestand",
263 "rui.kind.own": "eigen",
264 "rui.delete": "Verwijderen",
265 "rui.presetDelAsk": "Deze preset verwijderen? Jobs die hem gebruiken mislukken tot je hem weer toevoegt.",
266 "rui.presetAdd": "Preset toevoegen of wijzigen",
267 "rui.presetSave": "Preset opslaan",
268 "rui.f.alias": "Alias",
269 "rui.h.alias": "Kleine letters met een slash, bijv. team/tools. Een ingebouwde naam vervangt die preset.",
270 "rui.f.image": "Image",
271 "rui.h.image": "Gebruik dit image zoals het is (geen bouw). Laat leeg voor een Dockerfile.",
272 "rui.f.from": "Basis-image (FROM)",
273 "rui.h.from": "Vervangt de eerste FROM van de Dockerfile of van een ingebouwde preset.",
274 "rui.f.note": "Notitie",
275 "rui.f.dockerfile": "Dockerfile",
276 "rui.h.dockerfile": "Wordt één keer gebouwd en hergebruikt zolang de Dockerfile gelijk blijft.",
277 "rui.docs": "Documentatie",
278 "rui.docsLead": "Alles hier kan ook via de API:",
279 "rui.ok.saved": "Instellingen opgeslagen.",
280 "rui.ok.recommended": "Aanbevolen waarden toegepast.",
281 "rui.ok.paused": "Runner gepauzeerd. Lopende jobs maken af; nieuwe worden niet opgepakt.",
282 "rui.ok.resumed": "Runner hervat.",
283 "rui.ok.preset": "Preset opgeslagen.",
284 "rui.ok.presetDeleted": "Preset verwijderd.",
285 "rui.err.save": "Opslaan mislukt.",
286 "rui.err.name": "De naam mag letters, cijfers, spaties, punten, streepjes en underscores bevatten (max. 63).",
287 "rui.err.concurrency": "Jobs tegelijk moet tussen 1 en 64 liggen.",
288 "rui.err.images": "Maximaal aantal images moet tussen 1 en 1000 liggen.",
289 "rui.err.limits": "Limieten moeten positieve getallen zijn.",
290 "rui.err.memory": "Geheugen per job moet minstens 64 MB zijn.",
291 "rui.err.pull": "Onbekend pull-beleid.",
292 "rui.err.label": "Ongeldig label: %s",
293 "rui.err.presetDup": "Preset %s staat er twee keer in.",
294 "rui.err.presetEmpty": "Preset %s: geef een image, een Dockerfile of een basis-image.",
295 "rui.err.presetBoth": "Preset %s: een image gaat niet samen met een Dockerfile of basis-image.",
296 "rui.err.presetFrom": "Preset %s: alleen een basis-image kan alleen bij een ingebouwde preset.",
297 "rui.err.presetDockerfile": "Preset %s: de Dockerfile heeft een FROM-regel nodig.",
298 "rui.err.preset": "Preset %s is ongeldig: %s",
299 "rui.nav.overview": "Overzicht",
300 "rui.nav.docs": "Docs",
301 "rui.nav.logout": "Afmelden",
302 "rui.login": "Aanmelden bij de runner",
303 "rui.loginLead": "Gebruik het beheertoken van deze machine. Je ziet het op de machine zelf met:",
304 "rui.loginBad": "Dat token klopt niet.",
305 "rui.token": "Beheertoken",
306 "rui.loginBtn": "Aanmelden",
307 "rdoc.title": "Runnerdocumentatie",
308 "rdoc.intro.h": "Wat deze runner doet",
309 "rdoc.intro.p": "bluegit-runner draait CI-jobs van BlueGit in Docker-containers op deze machine. Hij vraagt de server om werk; de server maakt nooit verbinding met de runner.",
310 "rdoc.network.h": "Netwerk",
311 "rdoc.network.p": "Alleen uitgaand HTTPS (poort 443) naar de BlueGit-server is nodig, plus internet voor images en packages die de jobs ophalen. Er hoeven geen poorten open, ook niet achter NAT.",
312 "rdoc.ui.h": "Deze webinterface",
313 "rdoc.ui.p": "Hij luistert standaard op 127.0.0.1:8765. Wijzig ui_listen in /etc/bluegit-runner/config.yml (of zet hem op off). Meld je aan met het beheertoken uit bluegit-runner ui-token; het staat in de werkmap met mode 0600 en komt nooit in de logs. Gebruik een SSH-tunnel om hem vanaf een andere computer te bereiken.",
314 "rdoc.settings.h": "Instellingen en aanbevelingen",
315 "rdoc.settings.p": "Instellingen staan in settings.json in de werkmap en gelden meteen. Aanbevelingen gaan uit van ongeveer 2 kernen en 2 GB per job, houden 1 kern en 1 GB voor de host en rekenen ongeveer 10 GB schijf per job. Limieten per job worden docker run --cpus, --memory en --pids-limit.",
316 "rdoc.presets.h": "Image-presets",
317 "rdoc.presets.p": "Presets werken zoals bij de ingebouwde runner: image: bluegit/node in een pipeline is een Dockerfile die hier bij het eerste gebruik wordt gebouwd en hergebruikt zolang hij gelijk blijft. Voeg een eigen preset toe als vast image of als Dockerfile, eventueel met een ander basis-image.",
318 "rdoc.pause.h": "Pauze (aflopen)",
319 "rdoc.pause.p": "Pauze laat lopende jobs afmaken en pakt geen nieuwe meer op. BlueGit toont de runner als gepauzeerd en stuurt jobs naar de volgende runner, of laat ze in de wachtrij.",
320 "rdoc.upgrade.h": "Veilig upgraden",
321 "rdoc.upgrade.p": "Pauzeer de runner, wacht tot het overzicht zegt dat upgraden veilig is (geen actieve jobs), upgrade het pakket (bijv. yay -Syu bluegit-runner) en hervat. Een job die halverwege wegvalt, zet de server na 5 minuten zonder contact op mislukt en probeert hem opnieuw als de retry-regels dat toestaan.",
322 "rdoc.api.h": "Lokale API",
323 "rdoc.api.p": "Dezelfde acties zijn er als JSON met het beheertoken als Bearer-token: GET /api/status, GET en PUT /api/settings, GET /api/jobs, POST /api/pause en POST /api/resume.",
324 "rdoc.trouble.h": "Problemen oplossen",
325 "rdoc.trouble.p": "Offline in BlueGit: kijk in journalctl -u bluegit-runner en of HTTPS naar de server werkt. Jobs mislukken met runner_system_failure: controleer docker info als gebruiker bluegit-runner (groep docker). 401 van de server: de runner is ingetrokken; registreer opnieuw. De webinterface opent niet: controleer ui_listen en of niets anders de poort gebruikt.",
326 "rdoc.cmd.h": "Handige commando’s",
327 "rdoc.more": "Volledige documentatie op de server:",
328}
329
330var ruiDE = map[string]string{
331 "nav.help": "Hilfe",
332 "nav.adminRunner": "Runner",
333 "title.help": "Hilfe",
334 "help.lead": "Dokumentation zu BlueGit, den Runnern und der API, immer passend zur laufenden Version.",
335 "help.fallback": "Diese Seite gibt es noch nicht in deiner Sprache; sie wird in einer anderen Sprache angezeigt.",
336 "help.otherLang": "andere Sprache",
337 "help.runnerDocs": "Runner-Dokumentation",
338 "help.runners": "Runner",
339 "help.api": "API",
340 "help.what": "Was ist das?",
341 "runner.draining": "auf dem Runner pausiert",
342 "rui.brand": "BlueGit-Runner",
343 "rui.title": "Runner",
344 "rui.lead": "Verwalte diesen bluegit-runner: Kapazität, Limits pro Job, Image-Presets, Pause und laufende Jobs.",
345 "rui.leadBuiltin": "Der eingebaute BlueGit-Runner läuft auf diesem Server. Nur Website-Administratoren können ihn ändern.",
346 "rui.ciOff": "CI ist auf diesem Server deaktiviert.",
347 "rui.state.online": "online",
348 "rui.state.offline": "offline",
349 "rui.state.paused": "pausiert",
350 "rui.state.draining": "läuft aus",
351 "rui.status": "Status",
352 "rui.version": "Version",
353 "rui.server": "Server",
354 "rui.contact": "Letzter Kontakt",
355 "rui.serverPause": "In BlueGit pausiert",
356 "rui.hardware": "Hardware",
357 "rui.hw.cpu": "CPU-Kerne",
358 "rui.hw.mem": "Arbeitsspeicher",
359 "rui.hw.disk": "Festplatte (Arbeitsverzeichnis)",
360 "rui.hw.diskVal": "%d GB frei von %d GB",
361 "rui.upgrade": "Upgrade",
362 "rui.activeCount": "Jobs laufen",
363 "rui.safe": "Sicher zum Upgraden: nichts läuft.",
364 "rui.notSafe": "Noch nicht sicher: Runner pausieren und warten, bis die Jobs fertig sind.",
365 "rui.pause": "Pausieren (auslaufen)",
366 "rui.resume": "Fortsetzen",
367 "rui.pauseAsk": "Diesen Runner pausieren? Laufende Jobs werden fertig, neue warten oder gehen an einen anderen Runner.",
368 "rui.pauseHelp": "Pausiert: laufende Jobs werden fertig, neue werden nicht angenommen und BlueGit zeigt den Runner als pausiert.",
369 "rui.active": "Aktive Jobs",
370 "rui.recent": "Letzte Jobs",
371 "rui.noActive": "Es laufen keine Jobs.",
372 "rui.noRecent": "Seit dem Start keine abgeschlossenen Jobs.",
373 "rui.col.job": "Job",
374 "rui.col.project": "Projekt",
375 "rui.col.image": "Image",
376 "rui.col.duration": "Dauer",
377 "rui.col.status": "Status",
378 "rui.col.finished": "Beendet",
379 "rui.col.alias": "Alias",
380 "rui.col.base": "Basiert auf",
381 "rui.col.kind": "Quelle",
382 "rui.pipeline": "Pipeline #%d",
383 "rui.job.success": "erfolgreich",
384 "rui.job.failed": "fehlgeschlagen",
385 "rui.job.canceled": "abgebrochen",
386 "rui.settings": "Einstellungen",
387 "rui.applyRec": "Empfehlungen übernehmen",
388 "rui.recLead": "★ zeigt den empfohlenen Wert für die erkannte Hardware. Leer bedeutet kein Limit.",
389 "rui.rec": "empfohlen: %v",
390 "rui.unlimited": "kein Limit",
391 "rui.grp.general": "Allgemein",
392 "rui.grp.capacity": "Kapazität",
393 "rui.grp.limits": "Limits pro Job",
394 "rui.grp.images": "Images und Aufräumen",
395 "rui.f.name": "Name",
396 "rui.h.name": "Sichtbar in BlueGit und in Job-Logs; wird beim Speichern an den Server übertragen.",
397 "rui.h.nameBuiltin": "Sichtbar auf Job-Seiten und in Job-Logs. Leer nutzt runner.name aus der Konfiguration.",
398 "rui.f.labels": "Labels",
399 "rui.h.labels": "Durch Kommas getrennt, für die eigene Übersicht (z. B. docker, gpu).",
400 "rui.f.concurrency": "Gleichzeitige Jobs",
401 "rui.f.maxImages": "Maximal zwischengespeicherte Images",
402 "rui.f.timeout": "Maximale Jobdauer (Minuten)",
403 "rui.h.timeout": "Begrenzt das Timeout der Pipeline; leer folgt der Pipeline.",
404 "rui.f.cpus": "CPUs pro Job",
405 "rui.f.memory": "Speicher pro Job (MB)",
406 "rui.f.pids": "Prozesse pro Job",
407 "rui.f.disk": "Festplattenbudget (GB)",
408 "rui.h.disk": "Images, Checkouts und Cache zusammen",
409 "rui.f.pull": "Pull-Richtlinie",
410 "rui.pull.ifNotPresent": "Holen, wenn es fehlt",
411 "rui.pull.always": "Immer holen",
412 "rui.pull.never": "Nie holen (nur lokale Images)",
413 "rui.h.pull": "Für normale Images; Presets werden immer lokal gebaut.",
414 "rui.f.cleanupWork": "Arbeitsverzeichnis nach jedem Job löschen",
415 "rui.f.pruneDangling": "Verwaiste Images entfernen",
416 "rui.f.pruneCache": "Maximaler Job-Cache (GB)",
417 "rui.save": "Einstellungen speichern",
418 "rui.presets": "Image-Presets",
419 "rui.presetsLead": "Aliase wie bluegit/node, die ein Job als Image nutzen kann. Eingebaute Presets sind Dockerfiles, die beim ersten Einsatz lokal gebaut werden; eigene als Image oder Dockerfile hinzufügen.",
420 "rui.kind.builtin": "eingebaut",
421 "rui.kind.config": "Konfigurationsdatei",
422 "rui.kind.own": "eigenes",
423 "rui.delete": "Löschen",
424 "rui.presetDelAsk": "Dieses Preset löschen? Jobs, die es nutzen, schlagen fehl, bis du es wieder hinzufügst.",
425 "rui.presetAdd": "Preset hinzufügen oder ändern",
426 "rui.presetSave": "Preset speichern",
427 "rui.f.alias": "Alias",
428 "rui.h.alias": "Kleinbuchstaben mit Schrägstrich, z. B. team/tools. Ein eingebauter Name ersetzt dieses Preset.",
429 "rui.f.image": "Image",
430 "rui.h.image": "Dieses Image unverändert nutzen (kein Build). Für ein Dockerfile leer lassen.",
431 "rui.f.from": "Basis-Image (FROM)",
432 "rui.h.from": "Ersetzt das erste FROM des Dockerfiles oder eines eingebauten Presets.",
433 "rui.f.note": "Notiz",
434 "rui.f.dockerfile": "Dockerfile",
435 "rui.h.dockerfile": "Wird einmal gebaut und wiederverwendet, solange das Dockerfile gleich bleibt.",
436 "rui.docs": "Dokumentation",
437 "rui.docsLead": "Alles hier geht auch über die API:",
438 "rui.ok.saved": "Einstellungen gespeichert.",
439 "rui.ok.recommended": "Empfohlene Werte übernommen.",
440 "rui.ok.paused": "Runner pausiert. Laufende Jobs werden fertig; neue werden nicht angenommen.",
441 "rui.ok.resumed": "Runner fortgesetzt.",
442 "rui.ok.preset": "Preset gespeichert.",
443 "rui.ok.presetDeleted": "Preset gelöscht.",
444 "rui.err.save": "Speichern fehlgeschlagen.",
445 "rui.err.name": "Der Name darf Buchstaben, Ziffern, Leerzeichen, Punkte, Binde- und Unterstriche enthalten (max. 63).",
446 "rui.err.concurrency": "Gleichzeitige Jobs müssen zwischen 1 und 64 liegen.",
447 "rui.err.images": "Maximale Images müssen zwischen 1 und 1000 liegen.",
448 "rui.err.limits": "Limits müssen positive Zahlen sein.",
449 "rui.err.memory": "Speicher pro Job muss mindestens 64 MB sein.",
450 "rui.err.pull": "Unbekannte Pull-Richtlinie.",
451 "rui.err.label": "Ungültiges Label: %s",
452 "rui.err.presetDup": "Preset %s kommt doppelt vor.",
453 "rui.err.presetEmpty": "Preset %s: Image, Dockerfile oder Basis-Image angeben.",
454 "rui.err.presetBoth": "Preset %s: Ein Image lässt sich nicht mit Dockerfile oder Basis-Image kombinieren.",
455 "rui.err.presetFrom": "Preset %s: Nur ein Basis-Image geht nur bei einem eingebauten Preset.",
456 "rui.err.presetDockerfile": "Preset %s: Das Dockerfile braucht eine FROM-Zeile.",
457 "rui.err.preset": "Preset %s ist ungültig: %s",
458 "rui.nav.overview": "Übersicht",
459 "rui.nav.docs": "Doku",
460 "rui.nav.logout": "Abmelden",
461 "rui.login": "Am Runner anmelden",
462 "rui.loginLead": "Nutze das Admin-Token dieser Maschine. Anzeigen auf der Maschine selbst mit:",
463 "rui.loginBad": "Dieses Token ist nicht korrekt.",
464 "rui.token": "Admin-Token",
465 "rui.loginBtn": "Anmelden",
466 "rdoc.title": "Runner-Dokumentation",
467 "rdoc.intro.h": "Was dieser Runner macht",
468 "rdoc.intro.p": "bluegit-runner führt CI-Jobs aus BlueGit in Docker-Containern auf dieser Maschine aus. Er fragt den Server nach Arbeit; der Server verbindet sich nie mit dem Runner.",
469 "rdoc.network.h": "Netzwerk",
470 "rdoc.network.p": "Nötig ist nur ausgehendes HTTPS (Port 443) zum BlueGit-Server sowie Internet für Images und Pakete der Jobs. Es müssen keine Ports geöffnet werden, auch nicht hinter NAT.",
471 "rdoc.ui.h": "Diese Weboberfläche",
472 "rdoc.ui.p": "Standardmäßig lauscht sie auf 127.0.0.1:8765. Ändere ui_listen in /etc/bluegit-runner/config.yml (oder setze off). Anmeldung mit dem Admin-Token aus bluegit-runner ui-token; es liegt mit Modus 0600 im Arbeitsverzeichnis und landet nie in den Logs. Von einem anderen Rechner per SSH-Tunnel erreichen.",
473 "rdoc.settings.h": "Einstellungen und Empfehlungen",
474 "rdoc.settings.p": "Einstellungen liegen in settings.json im Arbeitsverzeichnis und gelten sofort. Empfehlungen rechnen mit etwa 2 Kernen und 2 GB pro Job, lassen 1 Kern und 1 GB für den Host und etwa 10 GB Platte pro Job. Limits pro Job werden zu docker run --cpus, --memory und --pids-limit.",
475 "rdoc.presets.h": "Image-Presets",
476 "rdoc.presets.p": "Presets funktionieren wie beim eingebauten Runner: image: bluegit/node in einer Pipeline ist ein Dockerfile, das hier beim ersten Einsatz gebaut und wiederverwendet wird, solange es gleich bleibt. Eigene Presets als festes Image oder Dockerfile, optional mit anderem Basis-Image.",
477 "rdoc.pause.h": "Pause (auslaufen)",
478 "rdoc.pause.p": "Die Pause lässt laufende Jobs fertig werden und nimmt keine neuen an. BlueGit zeigt den Runner als pausiert und schickt Jobs an den nächsten Runner oder lässt sie warten.",
479 "rdoc.upgrade.h": "Sicher upgraden",
480 "rdoc.upgrade.p": "Runner pausieren, warten bis die Übersicht ein sicheres Upgrade meldet (keine aktiven Jobs), Paket aktualisieren (z. B. yay -Syu bluegit-runner) und fortsetzen. Ein mittendrin abgebrochener Job wird vom Server nach 5 Minuten ohne Kontakt als fehlgeschlagen markiert und gemäß Retry-Regeln wiederholt.",
481 "rdoc.api.h": "Lokale API",
482 "rdoc.api.p": "Dieselben Aktionen gibt es als JSON mit dem Admin-Token als Bearer-Token: GET /api/status, GET und PUT /api/settings, GET /api/jobs, POST /api/pause und POST /api/resume.",
483 "rdoc.trouble.h": "Fehlerbehebung",
484 "rdoc.trouble.p": "Offline in BlueGit: journalctl -u bluegit-runner prüfen und ob HTTPS zum Server geht. Jobs scheitern mit runner_system_failure: docker info als Benutzer bluegit-runner prüfen (Gruppe docker). 401 vom Server: Runner wurde widerrufen; neu registrieren. Weboberfläche öffnet nicht: ui_listen prüfen und ob der Port belegt ist.",
485 "rdoc.cmd.h": "Nützliche Befehle",
486 "rdoc.more": "Vollständige Dokumentation auf dem Server:",
487}
488
489var ruiFR = map[string]string{
490 "nav.help": "Aide",
491 "nav.adminRunner": "Runner",
492 "title.help": "Aide",
493 "help.lead": "Documentation de BlueGit, des runners et de l’API, toujours alignée sur la version en service.",
494 "help.fallback": "Cette page n’existe pas encore dans ta langue ; elle s’affiche dans une autre langue.",
495 "help.otherLang": "autre langue",
496 "help.runnerDocs": "Documentation des runners",
497 "help.runners": "Runners",
498 "help.api": "API",
499 "help.what": "Qu’est-ce que c’est ?",
500 "runner.draining": "en pause sur le runner",
501 "rui.brand": "Runner BlueGit",
502 "rui.title": "Runner",
503 "rui.lead": "Gère ce bluegit-runner : capacité, limites par job, presets d’images, pause et jobs en cours.",
504 "rui.leadBuiltin": "Le runner BlueGit intégré tourne sur ce serveur. Seuls les administrateurs du site peuvent le modifier.",
505 "rui.ciOff": "La CI est désactivée sur ce serveur.",
506 "rui.state.online": "en ligne",
507 "rui.state.offline": "hors ligne",
508 "rui.state.paused": "en pause",
509 "rui.state.draining": "en vidange",
510 "rui.status": "État",
511 "rui.version": "Version",
512 "rui.server": "Serveur",
513 "rui.contact": "Dernier contact",
514 "rui.serverPause": "En pause dans BlueGit",
515 "rui.hardware": "Matériel",
516 "rui.hw.cpu": "Cœurs CPU",
517 "rui.hw.mem": "Mémoire",
518 "rui.hw.disk": "Disque (dossier de travail)",
519 "rui.hw.diskVal": "%d Go libres sur %d Go",
520 "rui.upgrade": "Mise à jour",
521 "rui.activeCount": "jobs en cours",
522 "rui.safe": "Mise à jour sans risque : rien ne tourne.",
523 "rui.notSafe": "Pas encore : mets le runner en pause et attends la fin des jobs.",
524 "rui.pause": "Pause (vidange)",
525 "rui.resume": "Reprendre",
526 "rui.pauseAsk": "Mettre ce runner en pause ? Les jobs en cours se terminent, les nouveaux attendent ou vont à un autre runner.",
527 "rui.pauseHelp": "En pause : les jobs en cours se terminent, aucun nouveau n’est pris et BlueGit affiche le runner en pause.",
528 "rui.active": "Jobs actifs",
529 "rui.recent": "Jobs récents",
530 "rui.noActive": "Aucun job en cours.",
531 "rui.noRecent": "Aucun job terminé depuis le démarrage.",
532 "rui.col.job": "Job",
533 "rui.col.project": "Projet",
534 "rui.col.image": "Image",
535 "rui.col.duration": "Durée",
536 "rui.col.status": "État",
537 "rui.col.finished": "Terminé",
538 "rui.col.alias": "Alias",
539 "rui.col.base": "Basé sur",
540 "rui.col.kind": "Source",
541 "rui.pipeline": "pipeline #%d",
542 "rui.job.success": "réussi",
543 "rui.job.failed": "échoué",
544 "rui.job.canceled": "annulé",
545 "rui.settings": "Paramètres",
546 "rui.applyRec": "Appliquer les recommandations",
547 "rui.recLead": "★ indique la valeur recommandée pour le matériel détecté. Vide signifie sans limite.",
548 "rui.rec": "recommandé : %v",
549 "rui.unlimited": "sans limite",
550 "rui.grp.general": "Général",
551 "rui.grp.capacity": "Capacité",
552 "rui.grp.limits": "Limites par job",
553 "rui.grp.images": "Images et nettoyage",
554 "rui.f.name": "Nom",
555 "rui.h.name": "Visible dans BlueGit et dans les journaux ; synchronisé avec le serveur à l’enregistrement.",
556 "rui.h.nameBuiltin": "Visible sur les pages de job et dans les journaux. Vide utilise runner.name de la configuration.",
557 "rui.f.labels": "Étiquettes",
558 "rui.h.labels": "Séparées par des virgules, pour ton propre suivi (par ex. docker, gpu).",
559 "rui.f.concurrency": "Jobs simultanés",
560 "rui.f.maxImages": "Images en cache au maximum",
561 "rui.f.timeout": "Durée maximale d’un job (minutes)",
562 "rui.h.timeout": "Plafonne le délai de la pipeline ; vide suit la pipeline.",
563 "rui.f.cpus": "CPU par job",
564 "rui.f.memory": "Mémoire par job (Mo)",
565 "rui.f.pids": "Processus par job",
566 "rui.f.disk": "Budget disque (Go)",
567 "rui.h.disk": "images, checkouts et cache ensemble",
568 "rui.f.pull": "Politique de pull",
569 "rui.pull.ifNotPresent": "Récupérer si absente",
570 "rui.pull.always": "Toujours récupérer",
571 "rui.pull.never": "Jamais (images locales uniquement)",
572 "rui.h.pull": "Pour les images normales ; les presets sont toujours construits localement.",
573 "rui.f.cleanupWork": "Supprimer le dossier de travail après chaque job",
574 "rui.f.pruneDangling": "Supprimer les images orphelines",
575 "rui.f.pruneCache": "Cache des jobs maximal (Go)",
576 "rui.save": "Enregistrer",
577 "rui.presets": "Presets d’images",
578 "rui.presetsLead": "Alias comme bluegit/node qu’un job peut utiliser comme image. Les presets intégrés sont des Dockerfiles construits localement au premier usage ; ajoute les tiens comme image ou Dockerfile.",
579 "rui.kind.builtin": "intégré",
580 "rui.kind.config": "fichier de config",
581 "rui.kind.own": "personnel",
582 "rui.delete": "Supprimer",
583 "rui.presetDelAsk": "Supprimer ce preset ? Les jobs qui l’utilisent échoueront jusqu’à ce que tu le rajoutes.",
584 "rui.presetAdd": "Ajouter ou modifier un preset",
585 "rui.presetSave": "Enregistrer le preset",
586 "rui.f.alias": "Alias",
587 "rui.h.alias": "En minuscules avec une barre, par ex. team/tools. Un nom intégré remplace ce preset.",
588 "rui.f.image": "Image",
589 "rui.h.image": "Utiliser cette image telle quelle (sans build). Laisser vide pour un Dockerfile.",
590 "rui.f.from": "Image de base (FROM)",
591 "rui.h.from": "Remplace le premier FROM du Dockerfile ou d’un preset intégré.",
592 "rui.f.note": "Note",
593 "rui.f.dockerfile": "Dockerfile",
594 "rui.h.dockerfile": "Construit une fois et réutilisé tant que le Dockerfile ne change pas.",
595 "rui.docs": "Documentation",
596 "rui.docsLead": "Tout ceci est aussi disponible via l’API :",
597 "rui.ok.saved": "Paramètres enregistrés.",
598 "rui.ok.recommended": "Valeurs recommandées appliquées.",
599 "rui.ok.paused": "Runner en pause. Les jobs en cours se terminent ; aucun nouveau n’est pris.",
600 "rui.ok.resumed": "Runner repris.",
601 "rui.ok.preset": "Preset enregistré.",
602 "rui.ok.presetDeleted": "Preset supprimé.",
603 "rui.err.save": "Échec de l’enregistrement.",
604 "rui.err.name": "Le nom peut contenir lettres, chiffres, espaces, points, tirets et soulignés (63 max.).",
605 "rui.err.concurrency": "Les jobs simultanés doivent être entre 1 et 64.",
606 "rui.err.images": "Le nombre d’images doit être entre 1 et 1000.",
607 "rui.err.limits": "Les limites doivent être des nombres positifs.",
608 "rui.err.memory": "La mémoire par job doit être d’au moins 64 Mo.",
609 "rui.err.pull": "Politique de pull inconnue.",
610 "rui.err.label": "Étiquette invalide : %s",
611 "rui.err.presetDup": "Le preset %s apparaît deux fois.",
612 "rui.err.presetEmpty": "Preset %s : indique une image, un Dockerfile ou une image de base.",
613 "rui.err.presetBoth": "Preset %s : une image ne se combine pas avec un Dockerfile ou une image de base.",
614 "rui.err.presetFrom": "Preset %s : une image de base seule ne vaut que pour un preset intégré.",
615 "rui.err.presetDockerfile": "Preset %s : le Dockerfile doit contenir une ligne FROM.",
616 "rui.err.preset": "Le preset %s est invalide : %s",
617 "rui.nav.overview": "Aperçu",
618 "rui.nav.docs": "Docs",
619 "rui.nav.logout": "Se déconnecter",
620 "rui.login": "Connexion au runner",
621 "rui.loginLead": "Utilise le jeton d’administration de cette machine. Affiche-le sur la machine avec :",
622 "rui.loginBad": "Ce jeton est incorrect.",
623 "rui.token": "Jeton d’administration",
624 "rui.loginBtn": "Se connecter",
625 "rdoc.title": "Documentation du runner",
626 "rdoc.intro.h": "Ce que fait ce runner",
627 "rdoc.intro.p": "bluegit-runner exécute les jobs CI de BlueGit dans des conteneurs Docker sur cette machine. Il demande du travail au serveur ; le serveur ne se connecte jamais au runner.",
628 "rdoc.network.h": "Réseau",
629 "rdoc.network.p": "Seul le HTTPS sortant (port 443) vers le serveur BlueGit est nécessaire, plus Internet pour les images et paquets des jobs. Aucun port à ouvrir, même derrière un NAT.",
630 "rdoc.ui.h": "Cette interface web",
631 "rdoc.ui.p": "Elle écoute par défaut sur 127.0.0.1:8765. Modifie ui_listen dans /etc/bluegit-runner/config.yml (ou mets off). Connecte-toi avec le jeton de bluegit-runner ui-token ; il est stocké dans le dossier de travail en mode 0600 et n’apparaît jamais dans les journaux. Utilise un tunnel SSH depuis un autre ordinateur.",
632 "rdoc.settings.h": "Paramètres et recommandations",
633 "rdoc.settings.p": "Les paramètres sont dans settings.json du dossier de travail et s’appliquent tout de suite. Les recommandations comptent environ 2 cœurs et 2 Go par job, gardent 1 cœur et 1 Go pour l’hôte et environ 10 Go de disque par job. Les limites deviennent docker run --cpus, --memory et --pids-limit.",
634 "rdoc.presets.h": "Presets d’images",
635 "rdoc.presets.p": "Les presets fonctionnent comme sur le runner intégré : image: bluegit/node dans une pipeline est un Dockerfile construit ici au premier usage et réutilisé tant qu’il ne change pas. Ajoute ton preset comme image fixe ou Dockerfile, avec éventuellement une autre image de base.",
636 "rdoc.pause.h": "Pause (vidange)",
637 "rdoc.pause.p": "La pause laisse finir les jobs en cours et n’en prend plus de nouveaux. BlueGit affiche le runner en pause et envoie les jobs au runner suivant, ou les garde en file.",
638 "rdoc.upgrade.h": "Mettre à jour sans risque",
639 "rdoc.upgrade.p": "Mets le runner en pause, attends que l’aperçu indique une mise à jour sans risque (aucun job actif), mets à jour le paquet (par ex. yay -Syu bluegit-runner) puis reprends. Un job coupé en cours est marqué échoué par le serveur après 5 minutes sans contact et relancé si les règles de retry le permettent.",
640 "rdoc.api.h": "API locale",
641 "rdoc.api.p": "Les mêmes actions existent en JSON avec le jeton d’administration en Bearer : GET /api/status, GET et PUT /api/settings, GET /api/jobs, POST /api/pause et POST /api/resume.",
642 "rdoc.trouble.h": "Dépannage",
643 "rdoc.trouble.p": "Hors ligne dans BlueGit : vérifie journalctl -u bluegit-runner et que le HTTPS vers le serveur passe. Jobs en runner_system_failure : vérifie docker info en tant que bluegit-runner (groupe docker). 401 du serveur : le runner a été révoqué ; réenregistre-le. L’interface ne s’ouvre pas : vérifie ui_listen et que le port est libre.",
644 "rdoc.cmd.h": "Commandes utiles",
645 "rdoc.more": "Documentation complète sur le serveur :",
646}
internal/i18n/rui_test.go added +60 −0
@@ -0,0 +1,60 @@
1 package i18n
2
3 import (
4 "os"
5 "path/filepath"
6 "regexp"
7 "testing"
8 )
9
10 // Elke sleutel die de runner-UI, /admin/runner, /help en de runner-docs
11 // gebruiken, bestaat in EN, NL, DE en FR (niet leeg, en niet alleen via
12 // de Engelse terugval).
13 func TestRunnerUIKeysInAllLanguages(t *testing.T) {
14 files := []string{
15 "../runnercfg/*.go", "../../cmd/bluegit-runner/*.go",
16 "../server/templates/help.html", "../server/templates/layout.html", "../server/admin_runner.go",
17 }
18 key := regexp.MustCompile(`"((?:rui|rdoc|help)\.[A-Za-z.]+[A-Za-z])"`)
19 used := map[string]bool{}
20 for _, g := range files {
21 matches, _ := filepath.Glob(g)
22 if len(matches) == 0 {
23 t.Fatalf("geen bestanden voor %s", g)
24 }
25 for _, f := range matches {
26 b, err := os.ReadFile(f)
27 if err != nil {
28 t.Fatal(err)
29 }
30 for _, m := range key.FindAllStringSubmatch(string(b), -1) {
31 used[m[1]] = true
32 }
33 }
34 }
35 // Opgebouwde sleutels (printf in sjablonen).
36 for _, s := range []string{"intro", "network", "ui", "settings", "presets", "pause", "upgrade", "api", "trouble"} {
37 used["rdoc."+s+".h"], used["rdoc."+s+".p"] = true, true
38 }
39 for _, s := range []string{"success", "failed", "canceled"} {
40 used["rui.job."+s] = true
41 }
42 if len(used) < 100 {
43 t.Fatalf("maar %d sleutels gevonden", len(used))
44 }
45 for k := range used {
46 for _, l := range []Lang{EN, NL, DE, FR} {
47 if catalogs[l][k] == "" {
48 t.Errorf("%s mist %s", l, k)
49 }
50 }
51 }
52 // Alle rui-sleutels in de catalogus bestaan in alle talen.
53 for k := range ruiEN {
54 for _, l := range []Lang{NL, DE, FR} {
55 if catalogs[l][k] == "" {
56 t.Errorf("%s mist %s", l, k)
57 }
58 }
59 }
60 }
@@ -0,0 +1,60 @@
1package i18n
2
3import (
4 "os"
5 "path/filepath"
6 "regexp"
7 "testing"
8)
9
10// Elke sleutel die de runner-UI, /admin/runner, /help en de runner-docs
11// gebruiken, bestaat in EN, NL, DE en FR (niet leeg, en niet alleen via
12// de Engelse terugval).
13func TestRunnerUIKeysInAllLanguages(t *testing.T) {
14 files := []string{
15 "../runnercfg/*.go", "../../cmd/bluegit-runner/*.go",
16 "../server/templates/help.html", "../server/templates/layout.html", "../server/admin_runner.go",
17 }
18 key := regexp.MustCompile(`"((?:rui|rdoc|help)\.[A-Za-z.]+[A-Za-z])"`)
19 used := map[string]bool{}
20 for _, g := range files {
21 matches, _ := filepath.Glob(g)
22 if len(matches) == 0 {
23 t.Fatalf("geen bestanden voor %s", g)
24 }
25 for _, f := range matches {
26 b, err := os.ReadFile(f)
27 if err != nil {
28 t.Fatal(err)
29 }
30 for _, m := range key.FindAllStringSubmatch(string(b), -1) {
31 used[m[1]] = true
32 }
33 }
34 }
35 // Opgebouwde sleutels (printf in sjablonen).
36 for _, s := range []string{"intro", "network", "ui", "settings", "presets", "pause", "upgrade", "api", "trouble"} {
37 used["rdoc."+s+".h"], used["rdoc."+s+".p"] = true, true
38 }
39 for _, s := range []string{"success", "failed", "canceled"} {
40 used["rui.job."+s] = true
41 }
42 if len(used) < 100 {
43 t.Fatalf("maar %d sleutels gevonden", len(used))
44 }
45 for k := range used {
46 for _, l := range []Lang{EN, NL, DE, FR} {
47 if catalogs[l][k] == "" {
48 t.Errorf("%s mist %s", l, k)
49 }
50 }
51 }
52 // Alle rui-sleutels in de catalogus bestaan in alle talen.
53 for k := range ruiEN {
54 for _, l := range []Lang{NL, DE, FR} {
55 if catalogs[l][k] == "" {
56 t.Errorf("%s mist %s", l, k)
57 }
58 }
59 }
60}
internal/runner/control.go added +88 −0
@@ -0,0 +1,88 @@
1 package runner
2
3 import (
4 "context"
5 "fmt"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/images"
9 "gitlab.com/Timfa/bluegit/internal/runnercfg"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 )
12
13 // Beheerbare instellingen (runnercfg) voor de ingebouwde én de aparte
14 // runner: limiet op gelijktijdige jobs, limieten per container,
15 // pull-policy, eigen presets en pauze. Alles wordt live toegepast.
16
17 // maxSlots is de bovengrens van het slotkanaal; de echte limiet is ctlLimit.
18 const maxSlots = 64
19
20 type control struct {
21 limit int
22 runArgs []string
23 pull string
24 timeout int
25 presets map[string]images.Override
26 set bool
27 }
28
29 // Configure past instellingen live toe. presets is het resultaat van
30 // Settings.Overrides (ci.presets plus eigen presets).
31 func (r *Runner) Configure(s runnercfg.Settings, presets map[string]images.Override) {
32 r.mu.Lock()
33 defer r.mu.Unlock()
34 r.ctl = control{limit: s.Concurrency, runArgs: s.RunArgs(), pull: s.PullPolicy, timeout: s.JobTimeoutMin, presets: presets, set: true}
35 if n := strings.TrimSpace(s.Name); n != "" {
36 r.Name = n
37 }
38 if r.Jobs != nil {
39 r.Jobs.SetPaused(s.Paused)
40 }
41 }
42
43 func (r *Runner) controls() control {
44 r.mu.RLock()
45 defer r.mu.RUnlock()
46 return r.ctl
47 }
48
49 func (r *Runner) presetSet() map[string]images.Override {
50 c := r.controls()
51 if c.set && c.presets != nil {
52 return c.presets
53 }
54 return r.Presets
55 }
56
57 // Paused zegt of de runner geen nieuwe jobs oppakt (drain).
58 func (r *Runner) Paused() bool {
59 return r.Jobs != nil && r.Jobs.Paused()
60 }
61
62 // Active is het aantal jobs dat deze runner nu draait.
63 func (r *Runner) Active() int {
64 if r.slots == nil {
65 return 0
66 }
67 return len(r.slots)
68 }
69
70 func (r *Runner) trackStart(job store.Job) {
71 if r.Jobs == nil {
72 return
73 }
74 info := runnercfg.JobInfo{ID: job.ID, Name: job.Name, Pipeline: job.PipelineID, Image: job.Image}
75 if r.Store != nil {
76 if repo, err := r.Store.RepoByID(context.Background(), job.RepoID); err == nil {
77 info.Project = repo.FullPath()
78 info.URL = fmt.Sprintf("%s/%s/-/pipelines/%d/jobs/%d", strings.TrimRight(r.BaseURL, "/"), repo.FullPath(), job.PipelineID, job.ID)
79 }
80 }
81 r.Jobs.Start(info)
82 }
83
84 func (r *Runner) trackDone(id int64, status string) {
85 if r.Jobs != nil {
86 r.Jobs.Finish(id, status)
87 }
88 }
@@ -0,0 +1,88 @@
1package runner
2
3import (
4 "context"
5 "fmt"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/images"
9 "gitlab.com/Timfa/bluegit/internal/runnercfg"
10 "gitlab.com/Timfa/bluegit/internal/store"
11)
12
13// Beheerbare instellingen (runnercfg) voor de ingebouwde én de aparte
14// runner: limiet op gelijktijdige jobs, limieten per container,
15// pull-policy, eigen presets en pauze. Alles wordt live toegepast.
16
17// maxSlots is de bovengrens van het slotkanaal; de echte limiet is ctlLimit.
18const maxSlots = 64
19
20type control struct {
21 limit int
22 runArgs []string
23 pull string
24 timeout int
25 presets map[string]images.Override
26 set bool
27}
28
29// Configure past instellingen live toe. presets is het resultaat van
30// Settings.Overrides (ci.presets plus eigen presets).
31func (r *Runner) Configure(s runnercfg.Settings, presets map[string]images.Override) {
32 r.mu.Lock()
33 defer r.mu.Unlock()
34 r.ctl = control{limit: s.Concurrency, runArgs: s.RunArgs(), pull: s.PullPolicy, timeout: s.JobTimeoutMin, presets: presets, set: true}
35 if n := strings.TrimSpace(s.Name); n != "" {
36 r.Name = n
37 }
38 if r.Jobs != nil {
39 r.Jobs.SetPaused(s.Paused)
40 }
41}
42
43func (r *Runner) controls() control {
44 r.mu.RLock()
45 defer r.mu.RUnlock()
46 return r.ctl
47}
48
49func (r *Runner) presetSet() map[string]images.Override {
50 c := r.controls()
51 if c.set && c.presets != nil {
52 return c.presets
53 }
54 return r.Presets
55}
56
57// Paused zegt of de runner geen nieuwe jobs oppakt (drain).
58func (r *Runner) Paused() bool {
59 return r.Jobs != nil && r.Jobs.Paused()
60}
61
62// Active is het aantal jobs dat deze runner nu draait.
63func (r *Runner) Active() int {
64 if r.slots == nil {
65 return 0
66 }
67 return len(r.slots)
68}
69
70func (r *Runner) trackStart(job store.Job) {
71 if r.Jobs == nil {
72 return
73 }
74 info := runnercfg.JobInfo{ID: job.ID, Name: job.Name, Pipeline: job.PipelineID, Image: job.Image}
75 if r.Store != nil {
76 if repo, err := r.Store.RepoByID(context.Background(), job.RepoID); err == nil {
77 info.Project = repo.FullPath()
78 info.URL = fmt.Sprintf("%s/%s/-/pipelines/%d/jobs/%d", strings.TrimRight(r.BaseURL, "/"), repo.FullPath(), job.PipelineID, job.ID)
79 }
80 }
81 r.Jobs.Start(info)
82}
83
84func (r *Runner) trackDone(id int64, status string) {
85 if r.Jobs != nil {
86 r.Jobs.Finish(id, status)
87 }
88}
internal/runner/control_test.go added +35 −0
@@ -0,0 +1,35 @@
1 package runner
2
3 import (
4 "testing"
5
6 "gitlab.com/Timfa/bluegit/internal/runnercfg"
7 )
8
9 func TestConfigureLimitPauseAndName(t *testing.T) {
10 r := &Runner{slots: make(chan struct{}, maxSlots), Jobs: &runnercfg.Tracker{}, Name: "Steve"}
11 s := runnercfg.Defaults()
12 s.Concurrency, s.Name, s.CPUs, s.PullPolicy = 2, "Steve 2", 1, runnercfg.PullNever
13 r.Configure(s, nil)
14 if !r.acquireSlot() || !r.acquireSlot() || r.acquireSlot() {
15 t.Fatal("limiet 2")
16 }
17 r.releaseSlot()
18 r.releaseSlot()
19 s.Concurrency = 3
20 r.Configure(s, nil)
21 for i := 0; i < 3; i++ {
22 if !r.acquireSlot() {
23 t.Fatal("live naar 3")
24 }
25 }
26 r.releaseSlot()
27 s.Paused = true
28 r.Configure(s, nil)
29 if r.acquireSlot() || !r.Paused() {
30 t.Fatal("pauze houdt nieuwe jobs tegen")
31 }
32 if r.BuiltinName() != "Steve 2" || r.controls().runArgs[0] != "--cpus" || r.controls().pull != runnercfg.PullNever {
33 t.Fatalf("%s %+v", r.BuiltinName(), r.controls())
34 }
35 }
@@ -0,0 +1,35 @@
1package runner
2
3import (
4 "testing"
5
6 "gitlab.com/Timfa/bluegit/internal/runnercfg"
7)
8
9func TestConfigureLimitPauseAndName(t *testing.T) {
10 r := &Runner{slots: make(chan struct{}, maxSlots), Jobs: &runnercfg.Tracker{}, Name: "Steve"}
11 s := runnercfg.Defaults()
12 s.Concurrency, s.Name, s.CPUs, s.PullPolicy = 2, "Steve 2", 1, runnercfg.PullNever
13 r.Configure(s, nil)
14 if !r.acquireSlot() || !r.acquireSlot() || r.acquireSlot() {
15 t.Fatal("limiet 2")
16 }
17 r.releaseSlot()
18 r.releaseSlot()
19 s.Concurrency = 3
20 r.Configure(s, nil)
21 for i := 0; i < 3; i++ {
22 if !r.acquireSlot() {
23 t.Fatal("live naar 3")
24 }
25 }
26 r.releaseSlot()
27 s.Paused = true
28 r.Configure(s, nil)
29 if r.acquireSlot() || !r.Paused() {
30 t.Fatal("pauze houdt nieuwe jobs tegen")
31 }
32 if r.BuiltinName() != "Steve 2" || r.controls().runArgs[0] != "--cpus" || r.controls().pull != runnercfg.PullNever {
33 t.Fatalf("%s %+v", r.BuiltinName(), r.controls())
34 }
35}
internal/runner/routing.go +2 −2
@@ -88,11 +88,11 @@ func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error
88 88 return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, active(own), nil, nil), nil
89 89 }
90 90
91 // active laat gepauzeerde runners weg uit de volgorde.
91 // active laat gepauzeerde (ook lokaal gepauzeerde) runners weg uit de volgorde.
92 92 func active(rs []store.Runner) []store.Runner {
93 93 var out []store.Runner
94 94 for _, r := range rs {
95 if !r.Paused {
95 if !r.Paused && !r.Draining {
96 96 out = append(out, r)
97 97 }
98 98 }
@@ -88,11 +88,11 @@ func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error
88 return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, active(own), nil, nil), nil
88 return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, active(own), nil, nil), nil
89}
89}
90
90
91// active laat gepauzeerde runners weg uit de volgorde.
91// active laat gepauzeerde (ook lokaal gepauzeerde) runners weg uit de volgorde.
92func active(rs []store.Runner) []store.Runner {
92func active(rs []store.Runner) []store.Runner {
93 var out []store.Runner
93 var out []store.Runner
94 for _, r := range rs {
94 for _, r := range rs {
95 if !r.Paused {
95 if !r.Paused && !r.Draining {
96 out = append(out, r)
96 out = append(out, r)
97 }
97 }
98 }
98 }
internal/runner/runner.go +31 −3
@@ -20,6 +20,7 @@ import (
20 20 "gitlab.com/Timfa/bluegit/internal/ci"
21 21 "gitlab.com/Timfa/bluegit/internal/gitrepo"
22 22 "gitlab.com/Timfa/bluegit/internal/images"
23 "gitlab.com/Timfa/bluegit/internal/runnercfg"
23 24 "gitlab.com/Timfa/bluegit/internal/store"
24 25 "gitlab.com/Timfa/bluegit/internal/webhook"
25 26 )
@@ -39,7 +40,10 @@ type Runner struct {
39 40 Log *slog.Logger
40 41 OnEvent func(repoID int64, ev webhook.Event)
41 42 // Presets zijn de image-aliassen uit ci.presets. Nil is de ingebouwde lijst.
42 Presets map[string]images.Override
43 Presets map[string]images.Override
44 // Jobs is het overzicht en de pauze (drain) voor de beheer-UI.
45 Jobs *runnercfg.Tracker
46 ctl control
43 47 slots chan struct{}
44 48 mu sync.RWMutex
45 49 cancelMu sync.Mutex
@@ -90,7 +94,12 @@ func (r *Runner) Loop(ctx context.Context, concurrency int) {
90 94 if concurrency < 1 {
91 95 concurrency = 1
92 96 }
93 r.slots = make(chan struct{}, concurrency)
97 r.slots = make(chan struct{}, maxSlots)
98 r.mu.Lock()
99 if !r.ctl.set {
100 r.ctl.limit = concurrency
101 }
102 r.mu.Unlock()
94 103 tick := time.NewTicker(2 * time.Second)
95 104 defer tick.Stop()
96 105 for {
@@ -265,9 +274,15 @@ func indexOf(jobs []store.Job, name string) int {
265 274 }
266 275
267 276 func (r *Runner) acquireSlot() bool {
277 if r.Paused() {
278 return false
279 }
268 280 if r.slots == nil {
269 281 return true
270 282 }
283 if l := r.controls().limit; l > 0 && len(r.slots) >= l {
284 return false
285 }
271 286 select {
272 287 case r.slots <- struct{}{}:
273 288 return true
@@ -300,6 +315,10 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
300 315 if job.Timeout > 0 {
301 316 limit = job.Timeout
302 317 }
318 if m := r.controls().timeout; m > 0 && (limit == 0 || time.Duration(m)*time.Minute < limit) {
319 limit = time.Duration(m) * time.Minute
320 }
321 r.trackStart(job)
303 322 if limit > 0 {
304 323 var cancel context.CancelFunc
305 324 runCtx, cancel = context.WithTimeout(base, limit)
@@ -323,6 +342,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
323 342 kind = classifyFailure(err)
324 343 extra = stamp(ci.Mask(err.Error(), mask))
325 344 }
345 r.trackDone(job.ID, status)
326 346 r.complete(p, job, before, status, extra, kind)
327 347 }
328 348
@@ -483,6 +503,11 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
483 503 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
484 504 // staat de waarde niet in de proceslijst.
485 505 args := []string{"run", "--rm", "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
506 ctl := r.controls()
507 args = append(args, ctl.runArgs...)
508 if ctl.pull == runnercfg.PullNever {
509 args = append(args, "--pull", "never")
510 }
486 511 cmdEnv := append([]string{}, os.Environ()...)
487 512 for k, v := range env {
488 513 args = append(args, "-e", k)
@@ -577,7 +602,7 @@ func shellScript(job store.Job, note placeNote) string {
577 602 // Een alias zoals bluegit/node wordt gebouwd. node:22 blijft zichzelf.
578 603 func (r *Runner) resolveImage(ctx context.Context, image string) (string, []string, error) {
579 604 image = strings.TrimSpace(image)
580 set, err := images.Effective(r.Presets)
605 set, err := images.Effective(r.presetSet())
581 606 if err != nil {
582 607 return image, nil, fmt.Errorf("runner_system_failure: %w", err)
583 608 }
@@ -590,6 +615,9 @@ func (r *Runner) resolveImage(ctx context.Context, image string) (string, []stri
590 615 }
591 616 p, ok := images.Find(set, image)
592 617 if !ok {
618 if r.controls().pull == runnercfg.PullAlways {
619 _, _ = execOut(ctx, r.Docker, "pull", "--quiet", image)
620 }
593 621 id, digests := r.inspectImage(ctx, image)
594 622 return image, dockerImageLines(image, id, digests), nil
595 623 }
@@ -20,6 +20,7 @@ import (
20 "gitlab.com/Timfa/bluegit/internal/ci"
20 "gitlab.com/Timfa/bluegit/internal/ci"
21 "gitlab.com/Timfa/bluegit/internal/gitrepo"
21 "gitlab.com/Timfa/bluegit/internal/gitrepo"
22 "gitlab.com/Timfa/bluegit/internal/images"
22 "gitlab.com/Timfa/bluegit/internal/images"
23 "gitlab.com/Timfa/bluegit/internal/runnercfg"
23 "gitlab.com/Timfa/bluegit/internal/store"
24 "gitlab.com/Timfa/bluegit/internal/store"
24 "gitlab.com/Timfa/bluegit/internal/webhook"
25 "gitlab.com/Timfa/bluegit/internal/webhook"
25)
26)
@@ -39,7 +40,10 @@ type Runner struct {
39 Log *slog.Logger
40 Log *slog.Logger
40 OnEvent func(repoID int64, ev webhook.Event)
41 OnEvent func(repoID int64, ev webhook.Event)
41 // Presets zijn de image-aliassen uit ci.presets. Nil is de ingebouwde lijst.
42 // Presets zijn de image-aliassen uit ci.presets. Nil is de ingebouwde lijst.
42 Presets map[string]images.Override
43 Presets map[string]images.Override
44 // Jobs is het overzicht en de pauze (drain) voor de beheer-UI.
45 Jobs *runnercfg.Tracker
46 ctl control
43 slots chan struct{}
47 slots chan struct{}
44 mu sync.RWMutex
48 mu sync.RWMutex
45 cancelMu sync.Mutex
49 cancelMu sync.Mutex
@@ -90,7 +94,12 @@ func (r *Runner) Loop(ctx context.Context, concurrency int) {
90 if concurrency < 1 {
94 if concurrency < 1 {
91 concurrency = 1
95 concurrency = 1
92 }
96 }
93 r.slots = make(chan struct{}, concurrency)
97 r.slots = make(chan struct{}, maxSlots)
98 r.mu.Lock()
99 if !r.ctl.set {
100 r.ctl.limit = concurrency
101 }
102 r.mu.Unlock()
94 tick := time.NewTicker(2 * time.Second)
103 tick := time.NewTicker(2 * time.Second)
95 defer tick.Stop()
104 defer tick.Stop()
96 for {
105 for {
@@ -265,9 +274,15 @@ func indexOf(jobs []store.Job, name string) int {
265}
274}
266
275
267func (r *Runner) acquireSlot() bool {
276func (r *Runner) acquireSlot() bool {
277 if r.Paused() {
278 return false
279 }
268 if r.slots == nil {
280 if r.slots == nil {
269 return true
281 return true
270 }
282 }
283 if l := r.controls().limit; l > 0 && len(r.slots) >= l {
284 return false
285 }
271 select {
286 select {
272 case r.slots <- struct{}{}:
287 case r.slots <- struct{}{}:
273 return true
288 return true
@@ -300,6 +315,10 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
300 if job.Timeout > 0 {
315 if job.Timeout > 0 {
301 limit = job.Timeout
316 limit = job.Timeout
302 }
317 }
318 if m := r.controls().timeout; m > 0 && (limit == 0 || time.Duration(m)*time.Minute < limit) {
319 limit = time.Duration(m) * time.Minute
320 }
321 r.trackStart(job)
303 if limit > 0 {
322 if limit > 0 {
304 var cancel context.CancelFunc
323 var cancel context.CancelFunc
305 runCtx, cancel = context.WithTimeout(base, limit)
324 runCtx, cancel = context.WithTimeout(base, limit)
@@ -323,6 +342,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
323 kind = classifyFailure(err)
342 kind = classifyFailure(err)
324 extra = stamp(ci.Mask(err.Error(), mask))
343 extra = stamp(ci.Mask(err.Error(), mask))
325 }
344 }
345 r.trackDone(job.ID, status)
326 r.complete(p, job, before, status, extra, kind)
346 r.complete(p, job, before, status, extra, kind)
327}
347}
328
348
@@ -483,6 +503,11 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
483 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
503 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
484 // staat de waarde niet in de proceslijst.
504 // staat de waarde niet in de proceslijst.
485 args := []string{"run", "--rm", "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
505 args := []string{"run", "--rm", "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
506 ctl := r.controls()
507 args = append(args, ctl.runArgs...)
508 if ctl.pull == runnercfg.PullNever {
509 args = append(args, "--pull", "never")
510 }
486 cmdEnv := append([]string{}, os.Environ()...)
511 cmdEnv := append([]string{}, os.Environ()...)
487 for k, v := range env {
512 for k, v := range env {
488 args = append(args, "-e", k)
513 args = append(args, "-e", k)
@@ -577,7 +602,7 @@ func shellScript(job store.Job, note placeNote) string {
577// Een alias zoals bluegit/node wordt gebouwd. node:22 blijft zichzelf.
602// Een alias zoals bluegit/node wordt gebouwd. node:22 blijft zichzelf.
578func (r *Runner) resolveImage(ctx context.Context, image string) (string, []string, error) {
603func (r *Runner) resolveImage(ctx context.Context, image string) (string, []string, error) {
579 image = strings.TrimSpace(image)
604 image = strings.TrimSpace(image)
580 set, err := images.Effective(r.Presets)
605 set, err := images.Effective(r.presetSet())
581 if err != nil {
606 if err != nil {
582 return image, nil, fmt.Errorf("runner_system_failure: %w", err)
607 return image, nil, fmt.Errorf("runner_system_failure: %w", err)
583 }
608 }
@@ -590,6 +615,9 @@ func (r *Runner) resolveImage(ctx context.Context, image string) (string, []stri
590 }
615 }
591 p, ok := images.Find(set, image)
616 p, ok := images.Find(set, image)
592 if !ok {
617 if !ok {
618 if r.controls().pull == runnercfg.PullAlways {
619 _, _ = execOut(ctx, r.Docker, "pull", "--quiet", image)
620 }
593 id, digests := r.inspectImage(ctx, image)
621 id, digests := r.inspectImage(ctx, image)
594 return image, dockerImageLines(image, id, digests), nil
622 return image, dockerImageLines(image, id, digests), nil
595 }
623 }
internal/runnercfg/cleanup.go added +91 −0
@@ -0,0 +1,91 @@
1 package runnercfg
2
3 import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "sort"
9 "time"
10 )
11
12 // Cleanup voert het opruimbeleid uit: images boven MaxImages (langst
13 // ongebruikt eerst), dangling images, en de jobcache boven PruneCacheGB.
14 // Fouten worden genegeerd; opruimen mag een job nooit laten mislukken.
15 func Cleanup(ctx context.Context, docker string, s Settings, t *Tracker, cacheDir string) []string {
16 var done []string
17 ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
18 defer cancel()
19 if t != nil && docker != "" {
20 for _, ref := range t.StaleImages(s.MaxImages) {
21 if exec.CommandContext(ctx, docker, "image", "rm", ref).Run() == nil {
22 done = append(done, "image rm "+ref)
23 }
24 }
25 }
26 if s.PruneDangling && docker != "" {
27 if exec.CommandContext(ctx, docker, "image", "prune", "-f").Run() == nil {
28 done = append(done, "image prune")
29 }
30 }
31 if s.PruneCacheGB > 0 && cacheDir != "" {
32 done = append(done, pruneDir(cacheDir, int64(s.PruneCacheGB)<<30)...)
33 }
34 return done
35 }
36
37 // pruneDir verwijdert de oudste submappen tot dir onder limit bytes is.
38 func pruneDir(dir string, limit int64) []string {
39 ents, err := os.ReadDir(dir)
40 if err != nil {
41 return nil
42 }
43 type e struct {
44 path string
45 size int64
46 mod time.Time
47 }
48 var all []e
49 var total int64
50 for _, d := range ents {
51 p := filepath.Join(dir, d.Name())
52 var size int64
53 _ = filepath.Walk(p, func(_ string, fi os.FileInfo, err error) error {
54 if err == nil && !fi.IsDir() {
55 size += fi.Size()
56 }
57 return nil
58 })
59 fi, _ := d.Info()
60 mod := time.Time{}
61 if fi != nil {
62 mod = fi.ModTime()
63 }
64 all = append(all, e{p, size, mod})
65 total += size
66 }
67 sort.Slice(all, func(i, k int) bool { return all[i].mod.Before(all[k].mod) })
68 var out []string
69 for _, x := range all {
70 if total <= limit {
71 break
72 }
73 if os.RemoveAll(x.path) == nil {
74 total -= x.size
75 out = append(out, "cache rm "+filepath.Base(x.path))
76 }
77 }
78 return out
79 }
80
81 // DirSizeGB is de grootte van dir in GB (afgerond naar beneden).
82 func DirSizeGB(dir string) int {
83 var size int64
84 _ = filepath.Walk(dir, func(_ string, fi os.FileInfo, err error) error {
85 if err == nil && !fi.IsDir() {
86 size += fi.Size()
87 }
88 return nil
89 })
90 return int(size >> 30)
91 }
@@ -0,0 +1,91 @@
1package runnercfg
2
3import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "sort"
9 "time"
10)
11
12// Cleanup voert het opruimbeleid uit: images boven MaxImages (langst
13// ongebruikt eerst), dangling images, en de jobcache boven PruneCacheGB.
14// Fouten worden genegeerd; opruimen mag een job nooit laten mislukken.
15func Cleanup(ctx context.Context, docker string, s Settings, t *Tracker, cacheDir string) []string {
16 var done []string
17 ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
18 defer cancel()
19 if t != nil && docker != "" {
20 for _, ref := range t.StaleImages(s.MaxImages) {
21 if exec.CommandContext(ctx, docker, "image", "rm", ref).Run() == nil {
22 done = append(done, "image rm "+ref)
23 }
24 }
25 }
26 if s.PruneDangling && docker != "" {
27 if exec.CommandContext(ctx, docker, "image", "prune", "-f").Run() == nil {
28 done = append(done, "image prune")
29 }
30 }
31 if s.PruneCacheGB > 0 && cacheDir != "" {
32 done = append(done, pruneDir(cacheDir, int64(s.PruneCacheGB)<<30)...)
33 }
34 return done
35}
36
37// pruneDir verwijdert de oudste submappen tot dir onder limit bytes is.
38func pruneDir(dir string, limit int64) []string {
39 ents, err := os.ReadDir(dir)
40 if err != nil {
41 return nil
42 }
43 type e struct {
44 path string
45 size int64
46 mod time.Time
47 }
48 var all []e
49 var total int64
50 for _, d := range ents {
51 p := filepath.Join(dir, d.Name())
52 var size int64
53 _ = filepath.Walk(p, func(_ string, fi os.FileInfo, err error) error {
54 if err == nil && !fi.IsDir() {
55 size += fi.Size()
56 }
57 return nil
58 })
59 fi, _ := d.Info()
60 mod := time.Time{}
61 if fi != nil {
62 mod = fi.ModTime()
63 }
64 all = append(all, e{p, size, mod})
65 total += size
66 }
67 sort.Slice(all, func(i, k int) bool { return all[i].mod.Before(all[k].mod) })
68 var out []string
69 for _, x := range all {
70 if total <= limit {
71 break
72 }
73 if os.RemoveAll(x.path) == nil {
74 total -= x.size
75 out = append(out, "cache rm "+filepath.Base(x.path))
76 }
77 }
78 return out
79}
80
81// DirSizeGB is de grootte van dir in GB (afgerond naar beneden).
82func DirSizeGB(dir string) int {
83 var size int64
84 _ = filepath.Walk(dir, func(_ string, fi os.FileInfo, err error) error {
85 if err == nil && !fi.IsDir() {
86 size += fi.Size()
87 }
88 return nil
89 })
90 return int(size >> 30)
91}
internal/runnercfg/handler.go added +394 −0
@@ -0,0 +1,394 @@
1 package runnercfg
2
3 import (
4 "bytes"
5 "encoding/json"
6 "errors"
7 "html/template"
8 "net/http"
9 "strconv"
10 "strings"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/images"
15 )
16
17 // Status is de kop van het scherm.
18 type Status struct {
19 Kind string `json:"kind"` // "standalone" of "builtin"
20 Name string `json:"name"`
21 Version string `json:"version"`
22 ServerURL string `json:"server_url"`
23 Online bool `json:"online"`
24 LastContact time.Time `json:"last_contact,omitempty"`
25 ServerPause bool `json:"server_paused"`
26 }
27
28 // Handler is de gedeelde webinterface en JSON-API voor runnerbeheer.
29 // Hij zit onder Prefix (bv. "" op de runner, "/admin/runner" in BlueGit).
30 // Auth en CSRF komen van de host.
31 type Handler struct {
32 Prefix string
33 File *File
34 Default Settings
35 Tracker *Tracker
36 WorkDir string
37 // BasePresets zijn presets uit de configuratie (alleen-lezen in de UI).
38 BasePresets map[string]images.Override
39 // Apply zet nieuwe instellingen live (na Save).
40 Apply func(Settings) error
41 Status func() Status
42 // Lang, Auth, CSRF en Layout komen van de host.
43 Lang func(r *http.Request) i18n.Lang
44 Auth func(w http.ResponseWriter, r *http.Request, write bool) bool
45 CSRF func(r *http.Request) (field, value string)
46 CheckCSRF func(r *http.Request) bool
47 Layout func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML)
48 DocsURL string
49 APIBase string
50 }
51
52 // Current leest de opgeslagen instellingen.
53 func (h *Handler) Current() Settings {
54 s, err := h.File.Load(h.Default)
55 if err != nil {
56 return h.Default
57 }
58 return s
59 }
60
61 func (h *Handler) save(s Settings) error {
62 if err := s.Validate(); err != nil {
63 return err
64 }
65 if err := h.File.Save(s); err != nil {
66 return err
67 }
68 if h.Tracker != nil {
69 h.Tracker.SetPaused(s.Paused)
70 }
71 if h.Apply != nil {
72 return h.Apply(s)
73 }
74 return nil
75 }
76
77 // Mount hangt de routes aan mux.
78 func (h *Handler) Mount(mux *http.ServeMux, withAPI bool) {
79 p := h.Prefix
80 page := p
81 if page == "" {
82 page = "/{$}"
83 }
84 mux.HandleFunc("GET "+page, h.page)
85 mux.HandleFunc("POST "+p+"/settings", h.form(h.postSettings))
86 mux.HandleFunc("POST "+p+"/recommend", h.form(h.postRecommend))
87 mux.HandleFunc("POST "+p+"/presets", h.form(h.postPreset))
88 mux.HandleFunc("POST "+p+"/presets/delete", h.form(h.postPresetDelete))
89 mux.HandleFunc("POST "+p+"/pause", h.form(func(r *http.Request, s *Settings) (string, error) { s.Paused = true; return "rui.ok.paused", nil }))
90 mux.HandleFunc("POST "+p+"/resume", h.form(func(r *http.Request, s *Settings) (string, error) { s.Paused = false; return "rui.ok.resumed", nil }))
91 if !withAPI {
92 return
93 }
94 api := h.APIBase
95 if api == "" {
96 api = p + "/api"
97 }
98 mux.HandleFunc("GET "+api+"/status", h.APIStatus)
99 mux.HandleFunc("GET "+api+"/settings", h.APISettings)
100 mux.HandleFunc("PUT "+api+"/settings", h.APISettings)
101 mux.HandleFunc("POST "+api+"/pause", h.APIPause(true))
102 mux.HandleFunc("POST "+api+"/resume", h.APIPause(false))
103 mux.HandleFunc("GET "+api+"/jobs", h.APIJobs)
104 }
105
106 func (h *Handler) lang(r *http.Request) i18n.Lang {
107 if h.Lang != nil {
108 return h.Lang(r)
109 }
110 return i18n.EN
111 }
112
113 func (h *Handler) back(w http.ResponseWriter, r *http.Request, ok, problem string) {
114 q := ""
115 if ok != "" {
116 q = "?ok=" + ok
117 } else if problem != "" {
118 q = "?err=" + problem
119 }
120 target := h.Prefix
121 if target == "" {
122 target = "/"
123 }
124 http.Redirect(w, r, target+q, http.StatusSeeOther)
125 }
126
127 // errKey maakt van een fout een catalogussleutel plus argumenten in de URL.
128 func errKey(err error) string {
129 var e Error
130 if errors.As(err, &e) {
131 parts := []string{e.Key}
132 for _, a := range e.Args {
133 parts = append(parts, strings.ReplaceAll(toString(a), "|", "/"))
134 }
135 return template.URLQueryEscaper(strings.Join(parts, "|"))
136 }
137 return "rui.err.save"
138 }
139
140 func toString(a any) string {
141 switch v := a.(type) {
142 case string:
143 return v
144 default:
145 b, _ := json.Marshal(v)
146 return string(b)
147 }
148 }
149
150 func (h *Handler) form(fn func(r *http.Request, s *Settings) (string, error)) http.HandlerFunc {
151 return func(w http.ResponseWriter, r *http.Request) {
152 if !h.Auth(w, r, true) {
153 return
154 }
155 if h.CheckCSRF != nil && !h.CheckCSRF(r) {
156 http.Error(w, "csrf", http.StatusForbidden)
157 return
158 }
159 _ = r.ParseForm()
160 s := h.Current()
161 ok, err := fn(r, &s)
162 if err == nil {
163 err = h.save(s)
164 }
165 if err != nil {
166 h.back(w, r, "", errKey(err))
167 return
168 }
169 h.back(w, r, ok, "")
170 }
171 }
172
173 func atoi(r *http.Request, k string, def int) int {
174 v := strings.TrimSpace(r.FormValue(k))
175 if v == "" {
176 return def
177 }
178 n, err := strconv.Atoi(v)
179 if err != nil {
180 return -1
181 }
182 return n
183 }
184
185 func (h *Handler) postSettings(r *http.Request, s *Settings) (string, error) {
186 s.Name = r.FormValue("name")
187 s.Concurrency = atoi(r, "concurrency", 1)
188 s.MaxImages = atoi(r, "max_images", 20)
189 cpus := strings.TrimSpace(strings.ReplaceAll(r.FormValue("cpus"), ",", "."))
190 if cpus == "" {
191 s.CPUs = 0
192 } else if f, err := strconv.ParseFloat(cpus, 64); err == nil {
193 s.CPUs = f
194 } else {
195 s.CPUs = -1
196 }
197 s.MemoryMB = atoi(r, "memory_mb", 0)
198 s.PidsLimit = atoi(r, "pids_limit", 0)
199 s.MaxDiskGB = atoi(r, "max_disk_gb", 0)
200 s.PruneCacheGB = atoi(r, "prune_cache_gb", 0)
201 s.JobTimeoutMin = atoi(r, "job_timeout_min", 0)
202 s.PullPolicy = r.FormValue("pull_policy")
203 s.CleanupWork = r.FormValue("cleanup_work") != ""
204 s.PruneDangling = r.FormValue("prune_dangling") != ""
205 s.Labels = strings.FieldsFunc(r.FormValue("labels"), func(c rune) bool { return c == ',' || c == ' ' || c == '\n' })
206 return "rui.ok.saved", nil
207 }
208
209 func (h *Handler) postRecommend(r *http.Request, s *Settings) (string, error) {
210 rec := Recommend(Detect(h.WorkDir))
211 s.Concurrency, s.MaxImages, s.CPUs, s.MemoryMB, s.PidsLimit = rec.Concurrency, rec.MaxImages, rec.CPUs, rec.MemoryMB, rec.PidsLimit
212 s.MaxDiskGB, s.PruneCacheGB = rec.MaxDiskGB, rec.PruneCacheGB
213 return "rui.ok.recommended", nil
214 }
215
216 func (h *Handler) postPreset(r *http.Request, s *Settings) (string, error) {
217 p := Preset{Name: r.FormValue("name"), Image: r.FormValue("image"), From: r.FormValue("from"), Dockerfile: r.FormValue("dockerfile"), Note: strings.TrimSpace(r.FormValue("note"))}
218 if err := p.Validate(); err != nil {
219 return "", err
220 }
221 replaced := false
222 for i := range s.Presets {
223 if s.Presets[i].Name == p.Name {
224 s.Presets[i], replaced = p, true
225 }
226 }
227 if !replaced {
228 s.Presets = append(s.Presets, p)
229 }
230 return "rui.ok.preset", nil
231 }
232
233 func (h *Handler) postPresetDelete(r *http.Request, s *Settings) (string, error) {
234 name := r.FormValue("name")
235 out := s.Presets[:0]
236 for _, p := range s.Presets {
237 if p.Name != name {
238 out = append(out, p)
239 }
240 }
241 s.Presets = out
242 return "rui.ok.presetDeleted", nil
243 }
244
245 // View is alles wat het fragment toont.
246 type View struct {
247 Lang i18n.Lang
248 Prefix string
249 CSRFField string
250 CSRF string
251 Status Status
252 S Settings
253 Rec Settings
254 HW Hardware
255 WorkGB int
256 Builtin []images.Preset
257 Config []string
258 Active []JobInfo
259 Recent []JobInfo
260 Safe bool
261 Notice string
262 Problem string
263 DocsURL string
264 APIBase string
265 }
266
267 func (h *Handler) view(r *http.Request) View {
268 lang := h.lang(r)
269 v := View{Lang: lang, Prefix: h.Prefix, S: h.Current(), DocsURL: h.DocsURL}
270 v.APIBase = h.APIBase
271 if v.APIBase == "" {
272 v.APIBase = h.Prefix + "/api"
273 }
274 if h.CSRF != nil {
275 v.CSRFField, v.CSRF = h.CSRF(r)
276 }
277 if h.Status != nil {
278 v.Status = h.Status()
279 }
280 v.HW = Detect(h.WorkDir)
281 v.Rec = Recommend(v.HW)
282 v.Builtin = images.Builtin()
283 for k := range h.BasePresets {
284 v.Config = append(v.Config, k)
285 }
286 if h.Tracker != nil {
287 v.Active, v.Recent, v.Safe = h.Tracker.Active(), h.Tracker.Recent(), h.Tracker.SafeToUpgrade()
288 }
289 if k := r.URL.Query().Get("ok"); strings.HasPrefix(k, "rui.ok.") {
290 v.Notice = i18n.T(lang, k)
291 }
292 if k := r.URL.Query().Get("err"); strings.HasPrefix(k, "rui.err.") {
293 parts := strings.Split(k, "|")
294 args := make([]any, 0, len(parts)-1)
295 for _, a := range parts[1:] {
296 args = append(args, a)
297 }
298 v.Problem = i18n.T(lang, parts[0], args...)
299 }
300 return v
301 }
302
303 func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
304 if !h.Auth(w, r, false) {
305 return
306 }
307 v := h.view(r)
308 h.Layout(w, r, v.Lang, i18n.T(v.Lang, "rui.title"), Render(v))
309 }
310
311 // Render maakt het HTML-fragment.
312 func Render(v View) template.HTML {
313 var b bytes.Buffer
314 if err := uiTmpl(v.Lang).ExecuteTemplate(&b, "runnerui", v); err != nil {
315 return template.HTML(template.HTMLEscapeString(err.Error()))
316 }
317 return template.HTML(b.String())
318 }
319
320 func (h *Handler) APIStatus(w http.ResponseWriter, r *http.Request) {
321 if !h.Auth(w, r, false) {
322 return
323 }
324 st := Status{}
325 if h.Status != nil {
326 st = h.Status()
327 }
328 s := h.Current()
329 hw := Detect(h.WorkDir)
330 writeJSON(w, http.StatusOK, map[string]any{
331 "status": st, "paused": s.Paused, "active_jobs": len(h.Tracker.Active()),
332 "safe_to_upgrade": h.Tracker.SafeToUpgrade(), "hardware": hw, "recommended": Recommend(hw),
333 })
334 }
335
336 func (h *Handler) APIJobs(w http.ResponseWriter, r *http.Request) {
337 if !h.Auth(w, r, false) {
338 return
339 }
340 writeJSON(w, http.StatusOK, map[string]any{"active": nonNil(h.Tracker.Active()), "recent": nonNil(h.Tracker.Recent()), "safe_to_upgrade": h.Tracker.SafeToUpgrade()})
341 }
342
343 func nonNil(j []JobInfo) []JobInfo {
344 if j == nil {
345 return []JobInfo{}
346 }
347 return j
348 }
349
350 func (h *Handler) APISettings(w http.ResponseWriter, r *http.Request) {
351 if !h.Auth(w, r, r.Method != http.MethodGet) {
352 return
353 }
354 if r.Method == http.MethodPut {
355 s := h.Current()
356 dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20))
357 if err := dec.Decode(&s); err != nil {
358 writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid JSON"})
359 return
360 }
361 if err := h.save(s); err != nil {
362 msg := err.Error()
363 var e Error
364 if errors.As(err, &e) {
365 msg = i18n.T(i18n.EN, e.Key, e.Args...)
366 }
367 writeJSON(w, http.StatusUnprocessableEntity, map[string]string{"error": msg})
368 return
369 }
370 }
371 writeJSON(w, http.StatusOK, h.Current())
372 }
373
374 func (h *Handler) APIPause(on bool) http.HandlerFunc {
375 return func(w http.ResponseWriter, r *http.Request) {
376 if !h.Auth(w, r, true) {
377 return
378 }
379 s := h.Current()
380 s.Paused = on
381 if err := h.save(s); err != nil {
382 writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
383 return
384 }
385 writeJSON(w, http.StatusOK, map[string]any{"paused": on, "active_jobs": len(h.Tracker.Active()), "safe_to_upgrade": h.Tracker.SafeToUpgrade()})
386 }
387 }
388
389 func writeJSON(w http.ResponseWriter, code int, v any) {
390 w.Header().Set("Content-Type", "application/json; charset=utf-8")
391 w.Header().Set("Cache-Control", "no-store")
392 w.WriteHeader(code)
393 _ = json.NewEncoder(w).Encode(v)
394 }
@@ -0,0 +1,394 @@
1package runnercfg
2
3import (
4 "bytes"
5 "encoding/json"
6 "errors"
7 "html/template"
8 "net/http"
9 "strconv"
10 "strings"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/images"
15)
16
17// Status is de kop van het scherm.
18type Status struct {
19 Kind string `json:"kind"` // "standalone" of "builtin"
20 Name string `json:"name"`
21 Version string `json:"version"`
22 ServerURL string `json:"server_url"`
23 Online bool `json:"online"`
24 LastContact time.Time `json:"last_contact,omitempty"`
25 ServerPause bool `json:"server_paused"`
26}
27
28// Handler is de gedeelde webinterface en JSON-API voor runnerbeheer.
29// Hij zit onder Prefix (bv. "" op de runner, "/admin/runner" in BlueGit).
30// Auth en CSRF komen van de host.
31type Handler struct {
32 Prefix string
33 File *File
34 Default Settings
35 Tracker *Tracker
36 WorkDir string
37 // BasePresets zijn presets uit de configuratie (alleen-lezen in de UI).
38 BasePresets map[string]images.Override
39 // Apply zet nieuwe instellingen live (na Save).
40 Apply func(Settings) error
41 Status func() Status
42 // Lang, Auth, CSRF en Layout komen van de host.
43 Lang func(r *http.Request) i18n.Lang
44 Auth func(w http.ResponseWriter, r *http.Request, write bool) bool
45 CSRF func(r *http.Request) (field, value string)
46 CheckCSRF func(r *http.Request) bool
47 Layout func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML)
48 DocsURL string
49 APIBase string
50}
51
52// Current leest de opgeslagen instellingen.
53func (h *Handler) Current() Settings {
54 s, err := h.File.Load(h.Default)
55 if err != nil {
56 return h.Default
57 }
58 return s
59}
60
61func (h *Handler) save(s Settings) error {
62 if err := s.Validate(); err != nil {
63 return err
64 }
65 if err := h.File.Save(s); err != nil {
66 return err
67 }
68 if h.Tracker != nil {
69 h.Tracker.SetPaused(s.Paused)
70 }
71 if h.Apply != nil {
72 return h.Apply(s)
73 }
74 return nil
75}
76
77// Mount hangt de routes aan mux.
78func (h *Handler) Mount(mux *http.ServeMux, withAPI bool) {
79 p := h.Prefix
80 page := p
81 if page == "" {
82 page = "/{$}"
83 }
84 mux.HandleFunc("GET "+page, h.page)
85 mux.HandleFunc("POST "+p+"/settings", h.form(h.postSettings))
86 mux.HandleFunc("POST "+p+"/recommend", h.form(h.postRecommend))
87 mux.HandleFunc("POST "+p+"/presets", h.form(h.postPreset))
88 mux.HandleFunc("POST "+p+"/presets/delete", h.form(h.postPresetDelete))
89 mux.HandleFunc("POST "+p+"/pause", h.form(func(r *http.Request, s *Settings) (string, error) { s.Paused = true; return "rui.ok.paused", nil }))
90 mux.HandleFunc("POST "+p+"/resume", h.form(func(r *http.Request, s *Settings) (string, error) { s.Paused = false; return "rui.ok.resumed", nil }))
91 if !withAPI {
92 return
93 }
94 api := h.APIBase
95 if api == "" {
96 api = p + "/api"
97 }
98 mux.HandleFunc("GET "+api+"/status", h.APIStatus)
99 mux.HandleFunc("GET "+api+"/settings", h.APISettings)
100 mux.HandleFunc("PUT "+api+"/settings", h.APISettings)
101 mux.HandleFunc("POST "+api+"/pause", h.APIPause(true))
102 mux.HandleFunc("POST "+api+"/resume", h.APIPause(false))
103 mux.HandleFunc("GET "+api+"/jobs", h.APIJobs)
104}
105
106func (h *Handler) lang(r *http.Request) i18n.Lang {
107 if h.Lang != nil {
108 return h.Lang(r)
109 }
110 return i18n.EN
111}
112
113func (h *Handler) back(w http.ResponseWriter, r *http.Request, ok, problem string) {
114 q := ""
115 if ok != "" {
116 q = "?ok=" + ok
117 } else if problem != "" {
118 q = "?err=" + problem
119 }
120 target := h.Prefix
121 if target == "" {
122 target = "/"
123 }
124 http.Redirect(w, r, target+q, http.StatusSeeOther)
125}
126
127// errKey maakt van een fout een catalogussleutel plus argumenten in de URL.
128func errKey(err error) string {
129 var e Error
130 if errors.As(err, &e) {
131 parts := []string{e.Key}
132 for _, a := range e.Args {
133 parts = append(parts, strings.ReplaceAll(toString(a), "|", "/"))
134 }
135 return template.URLQueryEscaper(strings.Join(parts, "|"))
136 }
137 return "rui.err.save"
138}
139
140func toString(a any) string {
141 switch v := a.(type) {
142 case string:
143 return v
144 default:
145 b, _ := json.Marshal(v)
146 return string(b)
147 }
148}
149
150func (h *Handler) form(fn func(r *http.Request, s *Settings) (string, error)) http.HandlerFunc {
151 return func(w http.ResponseWriter, r *http.Request) {
152 if !h.Auth(w, r, true) {
153 return
154 }
155 if h.CheckCSRF != nil && !h.CheckCSRF(r) {
156 http.Error(w, "csrf", http.StatusForbidden)
157 return
158 }
159 _ = r.ParseForm()
160 s := h.Current()
161 ok, err := fn(r, &s)
162 if err == nil {
163 err = h.save(s)
164 }
165 if err != nil {
166 h.back(w, r, "", errKey(err))
167 return
168 }
169 h.back(w, r, ok, "")
170 }
171}
172
173func atoi(r *http.Request, k string, def int) int {
174 v := strings.TrimSpace(r.FormValue(k))
175 if v == "" {
176 return def
177 }
178 n, err := strconv.Atoi(v)
179 if err != nil {
180 return -1
181 }
182 return n
183}
184
185func (h *Handler) postSettings(r *http.Request, s *Settings) (string, error) {
186 s.Name = r.FormValue("name")
187 s.Concurrency = atoi(r, "concurrency", 1)
188 s.MaxImages = atoi(r, "max_images", 20)
189 cpus := strings.TrimSpace(strings.ReplaceAll(r.FormValue("cpus"), ",", "."))
190 if cpus == "" {
191 s.CPUs = 0
192 } else if f, err := strconv.ParseFloat(cpus, 64); err == nil {
193 s.CPUs = f
194 } else {
195 s.CPUs = -1
196 }
197 s.MemoryMB = atoi(r, "memory_mb", 0)
198 s.PidsLimit = atoi(r, "pids_limit", 0)
199 s.MaxDiskGB = atoi(r, "max_disk_gb", 0)
200 s.PruneCacheGB = atoi(r, "prune_cache_gb", 0)
201 s.JobTimeoutMin = atoi(r, "job_timeout_min", 0)
202 s.PullPolicy = r.FormValue("pull_policy")
203 s.CleanupWork = r.FormValue("cleanup_work") != ""
204 s.PruneDangling = r.FormValue("prune_dangling") != ""
205 s.Labels = strings.FieldsFunc(r.FormValue("labels"), func(c rune) bool { return c == ',' || c == ' ' || c == '\n' })
206 return "rui.ok.saved", nil
207}
208
209func (h *Handler) postRecommend(r *http.Request, s *Settings) (string, error) {
210 rec := Recommend(Detect(h.WorkDir))
211 s.Concurrency, s.MaxImages, s.CPUs, s.MemoryMB, s.PidsLimit = rec.Concurrency, rec.MaxImages, rec.CPUs, rec.MemoryMB, rec.PidsLimit
212 s.MaxDiskGB, s.PruneCacheGB = rec.MaxDiskGB, rec.PruneCacheGB
213 return "rui.ok.recommended", nil
214}
215
216func (h *Handler) postPreset(r *http.Request, s *Settings) (string, error) {
217 p := Preset{Name: r.FormValue("name"), Image: r.FormValue("image"), From: r.FormValue("from"), Dockerfile: r.FormValue("dockerfile"), Note: strings.TrimSpace(r.FormValue("note"))}
218 if err := p.Validate(); err != nil {
219 return "", err
220 }
221 replaced := false
222 for i := range s.Presets {
223 if s.Presets[i].Name == p.Name {
224 s.Presets[i], replaced = p, true
225 }
226 }
227 if !replaced {
228 s.Presets = append(s.Presets, p)
229 }
230 return "rui.ok.preset", nil
231}
232
233func (h *Handler) postPresetDelete(r *http.Request, s *Settings) (string, error) {
234 name := r.FormValue("name")
235 out := s.Presets[:0]
236 for _, p := range s.Presets {
237 if p.Name != name {
238 out = append(out, p)
239 }
240 }
241 s.Presets = out
242 return "rui.ok.presetDeleted", nil
243}
244
245// View is alles wat het fragment toont.
246type View struct {
247 Lang i18n.Lang
248 Prefix string
249 CSRFField string
250 CSRF string
251 Status Status
252 S Settings
253 Rec Settings
254 HW Hardware
255 WorkGB int
256 Builtin []images.Preset
257 Config []string
258 Active []JobInfo
259 Recent []JobInfo
260 Safe bool
261 Notice string
262 Problem string
263 DocsURL string
264 APIBase string
265}
266
267func (h *Handler) view(r *http.Request) View {
268 lang := h.lang(r)
269 v := View{Lang: lang, Prefix: h.Prefix, S: h.Current(), DocsURL: h.DocsURL}
270 v.APIBase = h.APIBase
271 if v.APIBase == "" {
272 v.APIBase = h.Prefix + "/api"
273 }
274 if h.CSRF != nil {
275 v.CSRFField, v.CSRF = h.CSRF(r)
276 }
277 if h.Status != nil {
278 v.Status = h.Status()
279 }
280 v.HW = Detect(h.WorkDir)
281 v.Rec = Recommend(v.HW)
282 v.Builtin = images.Builtin()
283 for k := range h.BasePresets {
284 v.Config = append(v.Config, k)
285 }
286 if h.Tracker != nil {
287 v.Active, v.Recent, v.Safe = h.Tracker.Active(), h.Tracker.Recent(), h.Tracker.SafeToUpgrade()
288 }
289 if k := r.URL.Query().Get("ok"); strings.HasPrefix(k, "rui.ok.") {
290 v.Notice = i18n.T(lang, k)
291 }
292 if k := r.URL.Query().Get("err"); strings.HasPrefix(k, "rui.err.") {
293 parts := strings.Split(k, "|")
294 args := make([]any, 0, len(parts)-1)
295 for _, a := range parts[1:] {
296 args = append(args, a)
297 }
298 v.Problem = i18n.T(lang, parts[0], args...)
299 }
300 return v
301}
302
303func (h *Handler) page(w http.ResponseWriter, r *http.Request) {
304 if !h.Auth(w, r, false) {
305 return
306 }
307 v := h.view(r)
308 h.Layout(w, r, v.Lang, i18n.T(v.Lang, "rui.title"), Render(v))
309}
310
311// Render maakt het HTML-fragment.
312func Render(v View) template.HTML {
313 var b bytes.Buffer
314 if err := uiTmpl(v.Lang).ExecuteTemplate(&b, "runnerui", v); err != nil {
315 return template.HTML(template.HTMLEscapeString(err.Error()))
316 }
317 return template.HTML(b.String())
318}
319
320func (h *Handler) APIStatus(w http.ResponseWriter, r *http.Request) {
321 if !h.Auth(w, r, false) {
322 return
323 }
324 st := Status{}
325 if h.Status != nil {
326 st = h.Status()
327 }
328 s := h.Current()
329 hw := Detect(h.WorkDir)
330 writeJSON(w, http.StatusOK, map[string]any{
331 "status": st, "paused": s.Paused, "active_jobs": len(h.Tracker.Active()),
332 "safe_to_upgrade": h.Tracker.SafeToUpgrade(), "hardware": hw, "recommended": Recommend(hw),
333 })
334}
335
336func (h *Handler) APIJobs(w http.ResponseWriter, r *http.Request) {
337 if !h.Auth(w, r, false) {
338 return
339 }
340 writeJSON(w, http.StatusOK, map[string]any{"active": nonNil(h.Tracker.Active()), "recent": nonNil(h.Tracker.Recent()), "safe_to_upgrade": h.Tracker.SafeToUpgrade()})
341}
342
343func nonNil(j []JobInfo) []JobInfo {
344 if j == nil {
345 return []JobInfo{}
346 }
347 return j
348}
349
350func (h *Handler) APISettings(w http.ResponseWriter, r *http.Request) {
351 if !h.Auth(w, r, r.Method != http.MethodGet) {
352 return
353 }
354 if r.Method == http.MethodPut {
355 s := h.Current()
356 dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20))
357 if err := dec.Decode(&s); err != nil {
358 writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid JSON"})
359 return
360 }
361 if err := h.save(s); err != nil {
362 msg := err.Error()
363 var e Error
364 if errors.As(err, &e) {
365 msg = i18n.T(i18n.EN, e.Key, e.Args...)
366 }
367 writeJSON(w, http.StatusUnprocessableEntity, map[string]string{"error": msg})
368 return
369 }
370 }
371 writeJSON(w, http.StatusOK, h.Current())
372}
373
374func (h *Handler) APIPause(on bool) http.HandlerFunc {
375 return func(w http.ResponseWriter, r *http.Request) {
376 if !h.Auth(w, r, true) {
377 return
378 }
379 s := h.Current()
380 s.Paused = on
381 if err := h.save(s); err != nil {
382 writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
383 return
384 }
385 writeJSON(w, http.StatusOK, map[string]any{"paused": on, "active_jobs": len(h.Tracker.Active()), "safe_to_upgrade": h.Tracker.SafeToUpgrade()})
386 }
387}
388
389func writeJSON(w http.ResponseWriter, code int, v any) {
390 w.Header().Set("Content-Type", "application/json; charset=utf-8")
391 w.Header().Set("Cache-Control", "no-store")
392 w.WriteHeader(code)
393 _ = json.NewEncoder(w).Encode(v)
394}
internal/runnercfg/hardware.go added +113 −0
@@ -0,0 +1,113 @@
1 package runnercfg
2
3 import (
4 "bufio"
5 "math"
6 "os"
7 "runtime"
8 "strconv"
9 "strings"
10 "syscall"
11 )
12
13 // Hardware is wat de runner van zijn machine ziet.
14 type Hardware struct {
15 CPUs int
16 MemoryMB int
17 DiskFree int // GB vrij op de werkmap
18 DiskSize int // GB totaal
19 }
20
21 // Detect leest CPU's, /proc/meminfo en de schijf onder dir.
22 func Detect(dir string) Hardware {
23 h := Hardware{CPUs: runtime.NumCPU()}
24 if f, err := os.Open("/proc/meminfo"); err == nil {
25 sc := bufio.NewScanner(f)
26 for sc.Scan() {
27 fields := strings.Fields(sc.Text())
28 if len(fields) >= 2 && fields[0] == "MemTotal:" {
29 kb, _ := strconv.Atoi(fields[1])
30 h.MemoryMB = kb / 1024
31 }
32 }
33 f.Close()
34 }
35 for d := dir; d != ""; {
36 var st syscall.Statfs_t
37 if err := syscall.Statfs(d, &st); err == nil {
38 h.DiskFree = int(st.Bavail * uint64(st.Bsize) >> 30)
39 h.DiskSize = int(st.Blocks * uint64(st.Bsize) >> 30)
40 break
41 }
42 if d == "/" {
43 break
44 }
45 if i := strings.LastIndex(d, "/"); i > 0 {
46 d = d[:i]
47 } else {
48 d = "/"
49 }
50 }
51 return h
52 }
53
54 // Recommend geeft logische waarden voor deze hardware. Uitgangspunt: een
55 // CI-job wil ~2 kernen en ~2 GB; de host houdt 1 kern en 1 GB voor zichzelf,
56 // en per job ~10 GB schijf voor images, checkout en cache.
57 func Recommend(h Hardware) Settings {
58 r := Defaults()
59 cpu := h.CPUs
60 if cpu < 1 {
61 cpu = 1
62 }
63 mem := h.MemoryMB
64 byCPU := int(math.Max(1, float64((cpu-1)/2)))
65 byMem := 1
66 if mem > 0 {
67 byMem = int(math.Max(1, float64((mem-1024)/2048)))
68 }
69 byDisk := 64
70 if h.DiskFree > 0 {
71 byDisk = int(math.Max(1, float64(h.DiskFree/10)))
72 }
73 r.Concurrency = minInt(byCPU, byMem, byDisk, 8)
74 if r.Concurrency < 1 {
75 r.Concurrency = 1
76 }
77 share := float64(cpu-1) / float64(r.Concurrency)
78 if share < 1 {
79 share = 1
80 }
81 r.CPUs = math.Floor(share*2) / 2
82 if mem > 0 {
83 m := (mem - 1024) / r.Concurrency
84 if m < 512 {
85 m = 512
86 }
87 r.MemoryMB = m / 256 * 256
88 }
89 r.PidsLimit = 4096
90 if h.DiskFree > 0 {
91 r.MaxImages = minInt(maxInt(5, h.DiskFree/2), 50)
92 r.MaxDiskGB = maxInt(5, h.DiskFree*6/10)
93 r.PruneCacheGB = maxInt(2, h.DiskFree/10)
94 }
95 return r
96 }
97
98 func minInt(v ...int) int {
99 m := v[0]
100 for _, x := range v[1:] {
101 if x < m {
102 m = x
103 }
104 }
105 return m
106 }
107
108 func maxInt(a, b int) int {
109 if a > b {
110 return a
111 }
112 return b
113 }
@@ -0,0 +1,113 @@
1package runnercfg
2
3import (
4 "bufio"
5 "math"
6 "os"
7 "runtime"
8 "strconv"
9 "strings"
10 "syscall"
11)
12
13// Hardware is wat de runner van zijn machine ziet.
14type Hardware struct {
15 CPUs int
16 MemoryMB int
17 DiskFree int // GB vrij op de werkmap
18 DiskSize int // GB totaal
19}
20
21// Detect leest CPU's, /proc/meminfo en de schijf onder dir.
22func Detect(dir string) Hardware {
23 h := Hardware{CPUs: runtime.NumCPU()}
24 if f, err := os.Open("/proc/meminfo"); err == nil {
25 sc := bufio.NewScanner(f)
26 for sc.Scan() {
27 fields := strings.Fields(sc.Text())
28 if len(fields) >= 2 && fields[0] == "MemTotal:" {
29 kb, _ := strconv.Atoi(fields[1])
30 h.MemoryMB = kb / 1024
31 }
32 }
33 f.Close()
34 }
35 for d := dir; d != ""; {
36 var st syscall.Statfs_t
37 if err := syscall.Statfs(d, &st); err == nil {
38 h.DiskFree = int(st.Bavail * uint64(st.Bsize) >> 30)
39 h.DiskSize = int(st.Blocks * uint64(st.Bsize) >> 30)
40 break
41 }
42 if d == "/" {
43 break
44 }
45 if i := strings.LastIndex(d, "/"); i > 0 {
46 d = d[:i]
47 } else {
48 d = "/"
49 }
50 }
51 return h
52}
53
54// Recommend geeft logische waarden voor deze hardware. Uitgangspunt: een
55// CI-job wil ~2 kernen en ~2 GB; de host houdt 1 kern en 1 GB voor zichzelf,
56// en per job ~10 GB schijf voor images, checkout en cache.
57func Recommend(h Hardware) Settings {
58 r := Defaults()
59 cpu := h.CPUs
60 if cpu < 1 {
61 cpu = 1
62 }
63 mem := h.MemoryMB
64 byCPU := int(math.Max(1, float64((cpu-1)/2)))
65 byMem := 1
66 if mem > 0 {
67 byMem = int(math.Max(1, float64((mem-1024)/2048)))
68 }
69 byDisk := 64
70 if h.DiskFree > 0 {
71 byDisk = int(math.Max(1, float64(h.DiskFree/10)))
72 }
73 r.Concurrency = minInt(byCPU, byMem, byDisk, 8)
74 if r.Concurrency < 1 {
75 r.Concurrency = 1
76 }
77 share := float64(cpu-1) / float64(r.Concurrency)
78 if share < 1 {
79 share = 1
80 }
81 r.CPUs = math.Floor(share*2) / 2
82 if mem > 0 {
83 m := (mem - 1024) / r.Concurrency
84 if m < 512 {
85 m = 512
86 }
87 r.MemoryMB = m / 256 * 256
88 }
89 r.PidsLimit = 4096
90 if h.DiskFree > 0 {
91 r.MaxImages = minInt(maxInt(5, h.DiskFree/2), 50)
92 r.MaxDiskGB = maxInt(5, h.DiskFree*6/10)
93 r.PruneCacheGB = maxInt(2, h.DiskFree/10)
94 }
95 return r
96}
97
98func minInt(v ...int) int {
99 m := v[0]
100 for _, x := range v[1:] {
101 if x < m {
102 m = x
103 }
104 }
105 return m
106}
107
108func maxInt(a, b int) int {
109 if a > b {
110 return a
111 }
112 return b
113}
internal/runnercfg/runnercfg_test.go added +265 −0
@@ -0,0 +1,265 @@
1 package runnercfg
2
3 import (
4 "html/template"
5 "net/http"
6 "net/http/httptest"
7 "net/url"
8 "os"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 )
16
17 func TestValidate(t *testing.T) {
18 s := Defaults()
19 if err := s.Validate(); err != nil {
20 t.Fatal(err)
21 }
22 bad := []func(*Settings){
23 func(s *Settings) { s.Concurrency = 0 },
24 func(s *Settings) { s.Concurrency = 65 },
25 func(s *Settings) { s.MaxImages = 0 },
26 func(s *Settings) { s.MemoryMB = 10 },
27 func(s *Settings) { s.CPUs = -1 },
28 func(s *Settings) { s.PullPolicy = "sometimes" },
29 func(s *Settings) { s.Labels = []string{"bad label!"} },
30 func(s *Settings) { s.Name = "<script>" },
31 func(s *Settings) {
32 s.Presets = []Preset{{Name: "team/a", Image: "x:1"}, {Name: "team/a", Image: "y:1"}}
33 },
34 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", Image: "x:1", From: "y"}} },
35 func(s *Settings) { s.Presets = []Preset{{Name: "team/a"}} },
36 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", From: "debian"}} },
37 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", Dockerfile: "RUN true"}} },
38 func(s *Settings) { s.Presets = []Preset{{Name: "geenslash", Image: "x:1"}} },
39 }
40 for i, f := range bad {
41 s := Defaults()
42 f(&s)
43 err := s.Validate()
44 e, ok := err.(Error)
45 if !ok || !strings.HasPrefix(e.Key, "rui.err.") {
46 t.Fatalf("geval %d: %v", i, err)
47 }
48 if got := i18n.T(i18n.NL, e.Key, e.Args...); got == e.Key {
49 t.Fatalf("geval %d: geen vertaling voor %s", i, e.Key)
50 }
51 }
52 ok := Defaults()
53 ok.Labels = []string{" gpu", "gpu", "linux"}
54 ok.Presets = []Preset{{Name: "bluegit/python", From: "python:3.13-slim"}, {Name: "Team/Tools", Dockerfile: "FROM debian\nRUN true"}}
55 if err := ok.Validate(); err != nil {
56 t.Fatal(err)
57 }
58 if len(ok.Labels) != 2 || ok.Presets[1].Name != "team/tools" {
59 t.Fatalf("%+v", ok)
60 }
61 }
62
63 func TestRecommend(t *testing.T) {
64 r := Recommend(Hardware{CPUs: 8, MemoryMB: 16384, DiskFree: 200})
65 if r.Concurrency != 3 || r.CPUs != 2 || r.MemoryMB != 5120 || r.MaxImages != 50 {
66 t.Fatalf("8/16/200: %+v", r)
67 }
68 small := Recommend(Hardware{CPUs: 1, MemoryMB: 1024, DiskFree: 5})
69 if small.Concurrency != 1 || small.CPUs < 1 || small.MemoryMB < 512 {
70 t.Fatalf("klein: %+v", small)
71 }
72 if err := small.Validate(); err != nil {
73 t.Fatal(err)
74 }
75 big := Recommend(Hardware{CPUs: 64, MemoryMB: 262144, DiskFree: 4000})
76 if big.Concurrency != 8 {
77 t.Fatalf("groot: %+v", big)
78 }
79 if h := Detect(t.TempDir()); h.CPUs < 1 {
80 t.Fatalf("detect: %+v", h)
81 }
82 }
83
84 func TestRunArgsAndOverrides(t *testing.T) {
85 s := Defaults()
86 s.CPUs, s.MemoryMB, s.PidsLimit = 1.5, 2048, 100
87 if got := strings.Join(s.RunArgs(), " "); got != "--cpus 1.5 --memory 2048m --pids-limit 100" {
88 t.Fatal(got)
89 }
90 s.Presets = []Preset{{Name: "team/tools", Dockerfile: "FROM alpine"}, {Name: "team/node", Image: "node:22"}}
91 dir := t.TempDir()
92 over, err := s.Overrides(dir, nil)
93 if err != nil {
94 t.Fatal(err)
95 }
96 b, err := os.ReadFile(over["team/tools"].Dockerfile)
97 if err != nil || !strings.Contains(string(b), "FROM alpine") || over["team/node"].Image != "node:22" {
98 t.Fatalf("%v %s %+v", err, b, over)
99 }
100 }
101
102 func TestTracker(t *testing.T) {
103 var tr Tracker
104 if !tr.SafeToUpgrade() {
105 t.Fatal("leeg is veilig")
106 }
107 tr.Start(JobInfo{ID: 1, Name: "build", Image: "a"})
108 tr.Start(JobInfo{ID: 2, Name: "test", Image: "b"})
109 if tr.SafeToUpgrade() || len(tr.Active()) != 2 {
110 t.Fatal("actief")
111 }
112 tr.Finish(1, "success")
113 tr.Finish(99, "failed")
114 if len(tr.Active()) != 1 || len(tr.Recent()) != 1 || tr.Recent()[0].Status != "success" {
115 t.Fatalf("%+v %+v", tr.Active(), tr.Recent())
116 }
117 tr.Finish(2, "failed")
118 time.Sleep(time.Millisecond)
119 tr.Start(JobInfo{ID: 3, Image: "c"})
120 if st := tr.StaleImages(1); len(st) != 2 {
121 t.Fatalf("oud: %v", st)
122 }
123 tr.SetPaused(true)
124 if !tr.Paused() {
125 t.Fatal("pauze")
126 }
127 }
128
129 func testHandler(t *testing.T, allow bool) (*Handler, *http.ServeMux) {
130 dir := t.TempDir()
131 h := &Handler{
132 File: &File{Path: filepath.Join(dir, "settings.json")}, Default: Defaults(), Tracker: &Tracker{}, WorkDir: dir,
133 Status: func() Status { return Status{Kind: "standalone", Name: "pc", Online: true} },
134 Lang: func(r *http.Request) i18n.Lang { return i18n.Parse(r.URL.Query().Get("lang")) },
135 Auth: func(w http.ResponseWriter, r *http.Request, write bool) bool {
136 if !allow {
137 http.Error(w, "no", http.StatusUnauthorized)
138 }
139 return allow
140 },
141 CSRF: func(*http.Request) (string, string) { return "csrf", "goed" },
142 CheckCSRF: func(r *http.Request) bool { return r.FormValue("csrf") == "goed" },
143 Layout: func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
144 _, _ = w.Write([]byte(title + "\n" + string(body)))
145 },
146 }
147 mux := http.NewServeMux()
148 h.Mount(mux, true)
149 return h, mux
150 }
151
152 func post(mux http.Handler, path string, v url.Values) *httptest.ResponseRecorder {
153 req := httptest.NewRequest("POST", path, strings.NewReader(v.Encode()))
154 req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
155 w := httptest.NewRecorder()
156 mux.ServeHTTP(w, req)
157 return w
158 }
159
160 func TestHandlerPauseSettingsPresets(t *testing.T) {
161 h, mux := testHandler(t, true)
162 if w := post(mux, "/pause", url.Values{"csrf": {"fout"}}); w.Code != http.StatusForbidden {
163 t.Fatalf("csrf: %d", w.Code)
164 }
165 if w := post(mux, "/pause", url.Values{"csrf": {"goed"}}); w.Code != http.StatusSeeOther || !h.Tracker.Paused() || !h.Current().Paused {
166 t.Fatalf("pauze: %d", w.Code)
167 }
168 w := post(mux, "/settings", url.Values{"csrf": {"goed"}, "name": {"Mijn PC"}, "concurrency": {"4"}, "max_images": {"9"}, "cpus": {"1,5"}, "labels": {"gpu, linux"}, "pull_policy": {"never"}})
169 if !strings.Contains(w.Header().Get("Location"), "ok=rui.ok.saved") {
170 t.Fatal(w.Header().Get("Location"))
171 }
172 s := h.Current()
173 if s.Name != "Mijn PC" || s.Concurrency != 4 || s.CPUs != 1.5 || len(s.Labels) != 2 || s.PullPolicy != "never" || !s.Paused {
174 t.Fatalf("%+v", s)
175 }
176 w = post(mux, "/settings", url.Values{"csrf": {"goed"}, "concurrency": {"999"}, "max_images": {"9"}})
177 if !strings.Contains(w.Header().Get("Location"), "err=rui.err.concurrency") || h.Current().Concurrency != 4 {
178 t.Fatalf("ongeldig: %s", w.Header().Get("Location"))
179 }
180 post(mux, "/presets", url.Values{"csrf": {"goed"}, "name": {"team/tools"}, "image": {"alpine:3.20"}})
181 w = post(mux, "/presets", url.Values{"csrf": {"goed"}, "name": {"team/x"}, "image": {"a"}, "from": {"b"}})
182 if !strings.Contains(w.Header().Get("Location"), "rui.err.presetBoth") {
183 t.Fatal(w.Header().Get("Location"))
184 }
185 if len(h.Current().Presets) != 1 {
186 t.Fatal("preset")
187 }
188 post(mux, "/recommend", url.Values{"csrf": {"goed"}})
189 if h.Current().PidsLimit != 4096 {
190 t.Fatal("aanbeveling")
191 }
192 post(mux, "/presets/delete", url.Values{"csrf": {"goed"}, "name": {"team/tools"}})
193 post(mux, "/resume", url.Values{"csrf": {"goed"}})
194 if len(h.Current().Presets) != 0 || h.Tracker.Paused() {
195 t.Fatal("verwijderen/hervatten")
196 }
197 for _, l := range []string{"en", "nl", "de", "fr"} {
198 req := httptest.NewRequest("GET", "/?lang="+l+"&err=rui.err.label|x", nil)
199 rw := httptest.NewRecorder()
200 mux.ServeHTTP(rw, req)
201 page := rw.Body.String()
202 if rw.Code != 200 || !strings.Contains(page, `class="rui"`) || strings.Contains(page, "rui.") || strings.Contains(page, "rdoc.") {
203 t.Fatalf("%s: %d onvertaalde sleutel in pagina", l, rw.Code)
204 }
205 }
206 }
207
208 func TestHandlerAuth(t *testing.T) {
209 h, mux := testHandler(t, false)
210 for _, c := range []struct{ m, p string }{{"GET", "/"}, {"GET", "/api/status"}, {"PUT", "/api/settings"}, {"POST", "/api/pause"}, {"GET", "/api/jobs"}} {
211 req := httptest.NewRequest(c.m, c.p, strings.NewReader(`{"paused":true}`))
212 w := httptest.NewRecorder()
213 mux.ServeHTTP(w, req)
214 if w.Code != http.StatusUnauthorized {
215 t.Fatalf("%s %s: %d", c.m, c.p, w.Code)
216 }
217 }
218 if w := post(mux, "/pause", url.Values{"csrf": {"goed"}}); w.Code != http.StatusUnauthorized || h.Current().Paused {
219 t.Fatal("pauze zonder auth")
220 }
221 }
222
223 func TestHandlerAPI(t *testing.T) {
224 h, mux := testHandler(t, true)
225 req := httptest.NewRequest("PUT", "/api/settings", strings.NewReader(`{"concurrency":2,"memory_mb":1024}`))
226 w := httptest.NewRecorder()
227 mux.ServeHTTP(w, req)
228 if w.Code != 200 || h.Current().Concurrency != 2 || h.Current().MaxImages != 20 {
229 t.Fatalf("%d %s", w.Code, w.Body)
230 }
231 req = httptest.NewRequest("PUT", "/api/settings", strings.NewReader(`{"concurrency":0}`))
232 w = httptest.NewRecorder()
233 mux.ServeHTTP(w, req)
234 if w.Code != http.StatusUnprocessableEntity {
235 t.Fatal(w.Code)
236 }
237 h.Tracker.Start(JobInfo{ID: 5, Name: "build"})
238 req = httptest.NewRequest("POST", "/api/pause", nil)
239 w = httptest.NewRecorder()
240 mux.ServeHTTP(w, req)
241 if !strings.Contains(w.Body.String(), `"safe_to_upgrade":false`) || !h.Tracker.Paused() {
242 t.Fatal(w.Body.String())
243 }
244 h.Tracker.Finish(5, "success")
245 req = httptest.NewRequest("GET", "/api/status", nil)
246 w = httptest.NewRecorder()
247 mux.ServeHTTP(w, req)
248 if !strings.Contains(w.Body.String(), `"safe_to_upgrade":true`) || !strings.Contains(w.Body.String(), `"paused":true`) {
249 t.Fatal(w.Body.String())
250 }
251 }
252
253 func TestCleanupCache(t *testing.T) {
254 dir := t.TempDir()
255 for i, n := range []string{"old", "new"} {
256 p := filepath.Join(dir, n)
257 _ = os.MkdirAll(p, 0o755)
258 _ = os.WriteFile(filepath.Join(p, "f"), make([]byte, 1<<20), 0o644)
259 _ = os.Chtimes(p, time.Now().Add(time.Duration(i)*time.Hour), time.Now().Add(time.Duration(i)*time.Hour))
260 }
261 got := pruneDir(dir, 1<<20)
262 if len(got) != 1 || !strings.Contains(got[0], "old") {
263 t.Fatal(got)
264 }
265 }
@@ -0,0 +1,265 @@
1package runnercfg
2
3import (
4 "html/template"
5 "net/http"
6 "net/http/httptest"
7 "net/url"
8 "os"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15)
16
17func TestValidate(t *testing.T) {
18 s := Defaults()
19 if err := s.Validate(); err != nil {
20 t.Fatal(err)
21 }
22 bad := []func(*Settings){
23 func(s *Settings) { s.Concurrency = 0 },
24 func(s *Settings) { s.Concurrency = 65 },
25 func(s *Settings) { s.MaxImages = 0 },
26 func(s *Settings) { s.MemoryMB = 10 },
27 func(s *Settings) { s.CPUs = -1 },
28 func(s *Settings) { s.PullPolicy = "sometimes" },
29 func(s *Settings) { s.Labels = []string{"bad label!"} },
30 func(s *Settings) { s.Name = "<script>" },
31 func(s *Settings) {
32 s.Presets = []Preset{{Name: "team/a", Image: "x:1"}, {Name: "team/a", Image: "y:1"}}
33 },
34 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", Image: "x:1", From: "y"}} },
35 func(s *Settings) { s.Presets = []Preset{{Name: "team/a"}} },
36 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", From: "debian"}} },
37 func(s *Settings) { s.Presets = []Preset{{Name: "team/a", Dockerfile: "RUN true"}} },
38 func(s *Settings) { s.Presets = []Preset{{Name: "geenslash", Image: "x:1"}} },
39 }
40 for i, f := range bad {
41 s := Defaults()
42 f(&s)
43 err := s.Validate()
44 e, ok := err.(Error)
45 if !ok || !strings.HasPrefix(e.Key, "rui.err.") {
46 t.Fatalf("geval %d: %v", i, err)
47 }
48 if got := i18n.T(i18n.NL, e.Key, e.Args...); got == e.Key {
49 t.Fatalf("geval %d: geen vertaling voor %s", i, e.Key)
50 }
51 }
52 ok := Defaults()
53 ok.Labels = []string{" gpu", "gpu", "linux"}
54 ok.Presets = []Preset{{Name: "bluegit/python", From: "python:3.13-slim"}, {Name: "Team/Tools", Dockerfile: "FROM debian\nRUN true"}}
55 if err := ok.Validate(); err != nil {
56 t.Fatal(err)
57 }
58 if len(ok.Labels) != 2 || ok.Presets[1].Name != "team/tools" {
59 t.Fatalf("%+v", ok)
60 }
61}
62
63func TestRecommend(t *testing.T) {
64 r := Recommend(Hardware{CPUs: 8, MemoryMB: 16384, DiskFree: 200})
65 if r.Concurrency != 3 || r.CPUs != 2 || r.MemoryMB != 5120 || r.MaxImages != 50 {
66 t.Fatalf("8/16/200: %+v", r)
67 }
68 small := Recommend(Hardware{CPUs: 1, MemoryMB: 1024, DiskFree: 5})
69 if small.Concurrency != 1 || small.CPUs < 1 || small.MemoryMB < 512 {
70 t.Fatalf("klein: %+v", small)
71 }
72 if err := small.Validate(); err != nil {
73 t.Fatal(err)
74 }
75 big := Recommend(Hardware{CPUs: 64, MemoryMB: 262144, DiskFree: 4000})
76 if big.Concurrency != 8 {
77 t.Fatalf("groot: %+v", big)
78 }
79 if h := Detect(t.TempDir()); h.CPUs < 1 {
80 t.Fatalf("detect: %+v", h)
81 }
82}
83
84func TestRunArgsAndOverrides(t *testing.T) {
85 s := Defaults()
86 s.CPUs, s.MemoryMB, s.PidsLimit = 1.5, 2048, 100
87 if got := strings.Join(s.RunArgs(), " "); got != "--cpus 1.5 --memory 2048m --pids-limit 100" {
88 t.Fatal(got)
89 }
90 s.Presets = []Preset{{Name: "team/tools", Dockerfile: "FROM alpine"}, {Name: "team/node", Image: "node:22"}}
91 dir := t.TempDir()
92 over, err := s.Overrides(dir, nil)
93 if err != nil {
94 t.Fatal(err)
95 }
96 b, err := os.ReadFile(over["team/tools"].Dockerfile)
97 if err != nil || !strings.Contains(string(b), "FROM alpine") || over["team/node"].Image != "node:22" {
98 t.Fatalf("%v %s %+v", err, b, over)
99 }
100}
101
102func TestTracker(t *testing.T) {
103 var tr Tracker
104 if !tr.SafeToUpgrade() {
105 t.Fatal("leeg is veilig")
106 }
107 tr.Start(JobInfo{ID: 1, Name: "build", Image: "a"})
108 tr.Start(JobInfo{ID: 2, Name: "test", Image: "b"})
109 if tr.SafeToUpgrade() || len(tr.Active()) != 2 {
110 t.Fatal("actief")
111 }
112 tr.Finish(1, "success")
113 tr.Finish(99, "failed")
114 if len(tr.Active()) != 1 || len(tr.Recent()) != 1 || tr.Recent()[0].Status != "success" {
115 t.Fatalf("%+v %+v", tr.Active(), tr.Recent())
116 }
117 tr.Finish(2, "failed")
118 time.Sleep(time.Millisecond)
119 tr.Start(JobInfo{ID: 3, Image: "c"})
120 if st := tr.StaleImages(1); len(st) != 2 {
121 t.Fatalf("oud: %v", st)
122 }
123 tr.SetPaused(true)
124 if !tr.Paused() {
125 t.Fatal("pauze")
126 }
127}
128
129func testHandler(t *testing.T, allow bool) (*Handler, *http.ServeMux) {
130 dir := t.TempDir()
131 h := &Handler{
132 File: &File{Path: filepath.Join(dir, "settings.json")}, Default: Defaults(), Tracker: &Tracker{}, WorkDir: dir,
133 Status: func() Status { return Status{Kind: "standalone", Name: "pc", Online: true} },
134 Lang: func(r *http.Request) i18n.Lang { return i18n.Parse(r.URL.Query().Get("lang")) },
135 Auth: func(w http.ResponseWriter, r *http.Request, write bool) bool {
136 if !allow {
137 http.Error(w, "no", http.StatusUnauthorized)
138 }
139 return allow
140 },
141 CSRF: func(*http.Request) (string, string) { return "csrf", "goed" },
142 CheckCSRF: func(r *http.Request) bool { return r.FormValue("csrf") == "goed" },
143 Layout: func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
144 _, _ = w.Write([]byte(title + "\n" + string(body)))
145 },
146 }
147 mux := http.NewServeMux()
148 h.Mount(mux, true)
149 return h, mux
150}
151
152func post(mux http.Handler, path string, v url.Values) *httptest.ResponseRecorder {
153 req := httptest.NewRequest("POST", path, strings.NewReader(v.Encode()))
154 req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
155 w := httptest.NewRecorder()
156 mux.ServeHTTP(w, req)
157 return w
158}
159
160func TestHandlerPauseSettingsPresets(t *testing.T) {
161 h, mux := testHandler(t, true)
162 if w := post(mux, "/pause", url.Values{"csrf": {"fout"}}); w.Code != http.StatusForbidden {
163 t.Fatalf("csrf: %d", w.Code)
164 }
165 if w := post(mux, "/pause", url.Values{"csrf": {"goed"}}); w.Code != http.StatusSeeOther || !h.Tracker.Paused() || !h.Current().Paused {
166 t.Fatalf("pauze: %d", w.Code)
167 }
168 w := post(mux, "/settings", url.Values{"csrf": {"goed"}, "name": {"Mijn PC"}, "concurrency": {"4"}, "max_images": {"9"}, "cpus": {"1,5"}, "labels": {"gpu, linux"}, "pull_policy": {"never"}})
169 if !strings.Contains(w.Header().Get("Location"), "ok=rui.ok.saved") {
170 t.Fatal(w.Header().Get("Location"))
171 }
172 s := h.Current()
173 if s.Name != "Mijn PC" || s.Concurrency != 4 || s.CPUs != 1.5 || len(s.Labels) != 2 || s.PullPolicy != "never" || !s.Paused {
174 t.Fatalf("%+v", s)
175 }
176 w = post(mux, "/settings", url.Values{"csrf": {"goed"}, "concurrency": {"999"}, "max_images": {"9"}})
177 if !strings.Contains(w.Header().Get("Location"), "err=rui.err.concurrency") || h.Current().Concurrency != 4 {
178 t.Fatalf("ongeldig: %s", w.Header().Get("Location"))
179 }
180 post(mux, "/presets", url.Values{"csrf": {"goed"}, "name": {"team/tools"}, "image": {"alpine:3.20"}})
181 w = post(mux, "/presets", url.Values{"csrf": {"goed"}, "name": {"team/x"}, "image": {"a"}, "from": {"b"}})
182 if !strings.Contains(w.Header().Get("Location"), "rui.err.presetBoth") {
183 t.Fatal(w.Header().Get("Location"))
184 }
185 if len(h.Current().Presets) != 1 {
186 t.Fatal("preset")
187 }
188 post(mux, "/recommend", url.Values{"csrf": {"goed"}})
189 if h.Current().PidsLimit != 4096 {
190 t.Fatal("aanbeveling")
191 }
192 post(mux, "/presets/delete", url.Values{"csrf": {"goed"}, "name": {"team/tools"}})
193 post(mux, "/resume", url.Values{"csrf": {"goed"}})
194 if len(h.Current().Presets) != 0 || h.Tracker.Paused() {
195 t.Fatal("verwijderen/hervatten")
196 }
197 for _, l := range []string{"en", "nl", "de", "fr"} {
198 req := httptest.NewRequest("GET", "/?lang="+l+"&err=rui.err.label|x", nil)
199 rw := httptest.NewRecorder()
200 mux.ServeHTTP(rw, req)
201 page := rw.Body.String()
202 if rw.Code != 200 || !strings.Contains(page, `class="rui"`) || strings.Contains(page, "rui.") || strings.Contains(page, "rdoc.") {
203 t.Fatalf("%s: %d onvertaalde sleutel in pagina", l, rw.Code)
204 }
205 }
206}
207
208func TestHandlerAuth(t *testing.T) {
209 h, mux := testHandler(t, false)
210 for _, c := range []struct{ m, p string }{{"GET", "/"}, {"GET", "/api/status"}, {"PUT", "/api/settings"}, {"POST", "/api/pause"}, {"GET", "/api/jobs"}} {
211 req := httptest.NewRequest(c.m, c.p, strings.NewReader(`{"paused":true}`))
212 w := httptest.NewRecorder()
213 mux.ServeHTTP(w, req)
214 if w.Code != http.StatusUnauthorized {
215 t.Fatalf("%s %s: %d", c.m, c.p, w.Code)
216 }
217 }
218 if w := post(mux, "/pause", url.Values{"csrf": {"goed"}}); w.Code != http.StatusUnauthorized || h.Current().Paused {
219 t.Fatal("pauze zonder auth")
220 }
221}
222
223func TestHandlerAPI(t *testing.T) {
224 h, mux := testHandler(t, true)
225 req := httptest.NewRequest("PUT", "/api/settings", strings.NewReader(`{"concurrency":2,"memory_mb":1024}`))
226 w := httptest.NewRecorder()
227 mux.ServeHTTP(w, req)
228 if w.Code != 200 || h.Current().Concurrency != 2 || h.Current().MaxImages != 20 {
229 t.Fatalf("%d %s", w.Code, w.Body)
230 }
231 req = httptest.NewRequest("PUT", "/api/settings", strings.NewReader(`{"concurrency":0}`))
232 w = httptest.NewRecorder()
233 mux.ServeHTTP(w, req)
234 if w.Code != http.StatusUnprocessableEntity {
235 t.Fatal(w.Code)
236 }
237 h.Tracker.Start(JobInfo{ID: 5, Name: "build"})
238 req = httptest.NewRequest("POST", "/api/pause", nil)
239 w = httptest.NewRecorder()
240 mux.ServeHTTP(w, req)
241 if !strings.Contains(w.Body.String(), `"safe_to_upgrade":false`) || !h.Tracker.Paused() {
242 t.Fatal(w.Body.String())
243 }
244 h.Tracker.Finish(5, "success")
245 req = httptest.NewRequest("GET", "/api/status", nil)
246 w = httptest.NewRecorder()
247 mux.ServeHTTP(w, req)
248 if !strings.Contains(w.Body.String(), `"safe_to_upgrade":true`) || !strings.Contains(w.Body.String(), `"paused":true`) {
249 t.Fatal(w.Body.String())
250 }
251}
252
253func TestCleanupCache(t *testing.T) {
254 dir := t.TempDir()
255 for i, n := range []string{"old", "new"} {
256 p := filepath.Join(dir, n)
257 _ = os.MkdirAll(p, 0o755)
258 _ = os.WriteFile(filepath.Join(p, "f"), make([]byte, 1<<20), 0o644)
259 _ = os.Chtimes(p, time.Now().Add(time.Duration(i)*time.Hour), time.Now().Add(time.Duration(i)*time.Hour))
260 }
261 got := pruneDir(dir, 1<<20)
262 if len(got) != 1 || !strings.Contains(got[0], "old") {
263 t.Fatal(got)
264 }
265}
internal/runnercfg/settings.go added +247 −0
@@ -0,0 +1,247 @@
1 // Package runnercfg is de beheerbare configuratie van een runner: de
2 // aparte bluegit-runner en de ingebouwde BlueGit-runner (Steve) delen
3 // dezelfde instellingen, hardware-aanbevelingen, image-presets, pauze
4 // (drain) en het overzicht van actieve jobs. De webinterface van beide
5 // gebruikt het HTML-fragment uit ui.go.
6 package runnercfg
7
8 import (
9 "encoding/json"
10 "errors"
11 "fmt"
12 "os"
13 "path/filepath"
14 "regexp"
15 "sort"
16 "strings"
17 "sync"
18
19 "gitlab.com/Timfa/bluegit/internal/images"
20 )
21
22 // Pull-policy's voor gewone images (presets worden altijd lokaal gebouwd).
23 const (
24 PullIfNotPresent = "if-not-present"
25 PullAlways = "always"
26 PullNever = "never"
27 )
28
29 // Preset is een eigen image-template: óf een vast image, óf een Dockerfile
30 // (met optioneel een ander basis-image). Naam zoals team/tools.
31 type Preset struct {
32 Name string `json:"name"`
33 Image string `json:"image,omitempty"`
34 Dockerfile string `json:"dockerfile,omitempty"`
35 From string `json:"from,omitempty"`
36 Note string `json:"note,omitempty"`
37 }
38
39 // Settings zijn de instellingen die een beheerder in de UI ziet.
40 type Settings struct {
41 Name string `json:"name"`
42 Concurrency int `json:"concurrency"`
43 MaxImages int `json:"max_images"`
44 CPUs float64 `json:"cpus"` // per job; 0 = geen limiet
45 MemoryMB int `json:"memory_mb"` // per job; 0 = geen limiet
46 PidsLimit int `json:"pids_limit"` // per job; 0 = geen limiet
47 MaxDiskGB int `json:"max_disk_gb"`
48 PullPolicy string `json:"pull_policy"`
49 CleanupWork bool `json:"cleanup_work"`
50 PruneDangling bool `json:"prune_dangling"`
51 PruneCacheGB int `json:"prune_cache_gb"`
52 JobTimeoutMin int `json:"job_timeout_min"` // 0 = wat de job/server zegt
53 Labels []string `json:"labels"`
54 Presets []Preset `json:"presets"`
55 Paused bool `json:"paused"`
56 }
57
58 // Defaults zijn veilige standaardwaarden, ook zonder hardwaredetectie.
59 func Defaults() Settings {
60 return Settings{
61 Concurrency: 1, MaxImages: 20, MemoryMB: 0, CPUs: 0, PidsLimit: 0,
62 MaxDiskGB: 0, PullPolicy: PullIfNotPresent, CleanupWork: true,
63 PruneDangling: true, PruneCacheGB: 10,
64 }
65 }
66
67 var labelRE = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,62}$`)
68 var nameRE = regexp.MustCompile(`^[\pL\pN][\pL\pN ._-]{0,62}$`)
69
70 // Validate geeft een vertaalbare fout (sleutel uit de catalogus rui.err.*).
71 func (s *Settings) Validate() error {
72 s.Name = strings.TrimSpace(s.Name)
73 if s.Name != "" && !nameRE.MatchString(s.Name) {
74 return Err("rui.err.name")
75 }
76 if s.Concurrency < 1 || s.Concurrency > 64 {
77 return Err("rui.err.concurrency")
78 }
79 if s.MaxImages < 1 || s.MaxImages > 1000 {
80 return Err("rui.err.images")
81 }
82 if s.CPUs < 0 || s.CPUs > 512 || s.MemoryMB < 0 || s.PidsLimit < 0 || s.MaxDiskGB < 0 || s.PruneCacheGB < 0 || s.JobTimeoutMin < 0 {
83 return Err("rui.err.limits")
84 }
85 if s.MemoryMB > 0 && s.MemoryMB < 64 {
86 return Err("rui.err.memory")
87 }
88 switch s.PullPolicy {
89 case "":
90 s.PullPolicy = PullIfNotPresent
91 case PullIfNotPresent, PullAlways, PullNever:
92 default:
93 return Err("rui.err.pull")
94 }
95 var labels []string
96 seen := map[string]bool{}
97 for _, l := range s.Labels {
98 l = strings.TrimSpace(l)
99 if l == "" || seen[l] {
100 continue
101 }
102 if !labelRE.MatchString(l) {
103 return Err("rui.err.label", l)
104 }
105 seen[l] = true
106 labels = append(labels, l)
107 }
108 s.Labels = labels
109 names := map[string]bool{}
110 for i := range s.Presets {
111 p := &s.Presets[i]
112 if err := p.Validate(); err != nil {
113 return err
114 }
115 if names[p.Name] {
116 return Err("rui.err.presetDup", p.Name)
117 }
118 names[p.Name] = true
119 }
120 return nil
121 }
122
123 // Validate keurt één eigen preset goed (dezelfde regels als ci.presets).
124 func (p *Preset) Validate() error {
125 p.Name = strings.TrimSpace(strings.ToLower(p.Name))
126 p.Image, p.From = strings.TrimSpace(p.Image), strings.TrimSpace(p.From)
127 p.Dockerfile = strings.TrimSpace(strings.ReplaceAll(p.Dockerfile, "\r\n", "\n"))
128 if p.Image == "" && p.Dockerfile == "" && p.From == "" {
129 return Err("rui.err.presetEmpty", p.Name)
130 }
131 if p.Image != "" && (p.Dockerfile != "" || p.From != "") {
132 return Err("rui.err.presetBoth", p.Name)
133 }
134 if p.From != "" && p.Dockerfile == "" && !images.Known(p.Name) {
135 return Err("rui.err.presetFrom", p.Name)
136 }
137 if p.Dockerfile != "" && !strings.Contains(strings.ToUpper(p.Dockerfile), "FROM ") {
138 return Err("rui.err.presetDockerfile", p.Name)
139 }
140 o := images.Override{Image: p.Image, From: p.From}
141 if p.Dockerfile != "" {
142 o.Dockerfile = os.DevNull // bestaat; de echte tekst wordt later weggeschreven
143 }
144 if err := images.ValidateOverride(p.Name, o, images.Known(p.Name)); err != nil {
145 return Err("rui.err.preset", p.Name, err.Error())
146 }
147 return nil
148 }
149
150 // RunArgs zijn de extra `docker run`-argumenten voor de limieten per job.
151 func (s Settings) RunArgs() []string {
152 var out []string
153 if s.CPUs > 0 {
154 out = append(out, "--cpus", trimFloat(s.CPUs))
155 }
156 if s.MemoryMB > 0 {
157 out = append(out, "--memory", fmt.Sprintf("%dm", s.MemoryMB))
158 }
159 if s.PidsLimit > 0 {
160 out = append(out, "--pids-limit", fmt.Sprint(s.PidsLimit))
161 }
162 return out
163 }
164
165 func trimFloat(f float64) string {
166 return strings.TrimRight(strings.TrimRight(fmt.Sprintf("%.2f", f), "0"), ".")
167 }
168
169 // Overrides schrijft de Dockerfiles van eigen presets naar dir en geeft
170 // de aliassen zoals images.Effective ze wil. base zijn de presets uit de
171 // configuratie (ci.presets); eigen presets uit de UI gaan voor.
172 func (s Settings) Overrides(dir string, base map[string]images.Override) (map[string]images.Override, error) {
173 out := map[string]images.Override{}
174 for k, v := range base {
175 out[k] = v
176 }
177 for _, p := range s.Presets {
178 o := images.Override{Image: p.Image, From: p.From}
179 if p.Dockerfile != "" {
180 pd := filepath.Join(dir, "presets", strings.ReplaceAll(p.Name, "/", "__"))
181 if err := os.MkdirAll(pd, 0o755); err != nil {
182 return nil, err
183 }
184 f := filepath.Join(pd, "Dockerfile")
185 if err := os.WriteFile(f, []byte(p.Dockerfile+"\n"), 0o644); err != nil {
186 return nil, err
187 }
188 o.Dockerfile = f
189 }
190 out[p.Name] = o
191 }
192 return out, nil
193 }
194
195 // File bewaart Settings als JSON (schrijfbaar door de service, anders dan /etc).
196 type File struct {
197 Path string
198 mu sync.Mutex
199 }
200
201 // Load leest de instellingen; een ontbrekend bestand geeft def.
202 func (f *File) Load(def Settings) (Settings, error) {
203 f.mu.Lock()
204 defer f.mu.Unlock()
205 b, err := os.ReadFile(f.Path)
206 if errors.Is(err, os.ErrNotExist) {
207 return def, nil
208 }
209 if err != nil {
210 return def, err
211 }
212 s := def
213 if err := json.Unmarshal(b, &s); err != nil {
214 return def, fmt.Errorf("%s: %w", f.Path, err)
215 }
216 return s, nil
217 }
218
219 // Save schrijft atomair.
220 func (f *File) Save(s Settings) error {
221 f.mu.Lock()
222 defer f.mu.Unlock()
223 sort.SliceStable(s.Presets, func(i, j int) bool { return s.Presets[i].Name < s.Presets[j].Name })
224 b, err := json.MarshalIndent(s, "", " ")
225 if err != nil {
226 return err
227 }
228 if err := os.MkdirAll(filepath.Dir(f.Path), 0o755); err != nil {
229 return err
230 }
231 tmp := f.Path + ".tmp"
232 if err := os.WriteFile(tmp, b, 0o600); err != nil {
233 return err
234 }
235 return os.Rename(tmp, f.Path)
236 }
237
238 // Error is een vertaalbare fout; Key staat in de i18n-catalogus.
239 type Error struct {
240 Key string
241 Args []any
242 }
243
244 func (e Error) Error() string { return e.Key }
245
246 // Err maakt een Error.
247 func Err(key string, args ...any) error { return Error{Key: key, Args: args} }
@@ -0,0 +1,247 @@
1// Package runnercfg is de beheerbare configuratie van een runner: de
2// aparte bluegit-runner en de ingebouwde BlueGit-runner (Steve) delen
3// dezelfde instellingen, hardware-aanbevelingen, image-presets, pauze
4// (drain) en het overzicht van actieve jobs. De webinterface van beide
5// gebruikt het HTML-fragment uit ui.go.
6package runnercfg
7
8import (
9 "encoding/json"
10 "errors"
11 "fmt"
12 "os"
13 "path/filepath"
14 "regexp"
15 "sort"
16 "strings"
17 "sync"
18
19 "gitlab.com/Timfa/bluegit/internal/images"
20)
21
22// Pull-policy's voor gewone images (presets worden altijd lokaal gebouwd).
23const (
24 PullIfNotPresent = "if-not-present"
25 PullAlways = "always"
26 PullNever = "never"
27)
28
29// Preset is een eigen image-template: óf een vast image, óf een Dockerfile
30// (met optioneel een ander basis-image). Naam zoals team/tools.
31type Preset struct {
32 Name string `json:"name"`
33 Image string `json:"image,omitempty"`
34 Dockerfile string `json:"dockerfile,omitempty"`
35 From string `json:"from,omitempty"`
36 Note string `json:"note,omitempty"`
37}
38
39// Settings zijn de instellingen die een beheerder in de UI ziet.
40type Settings struct {
41 Name string `json:"name"`
42 Concurrency int `json:"concurrency"`
43 MaxImages int `json:"max_images"`
44 CPUs float64 `json:"cpus"` // per job; 0 = geen limiet
45 MemoryMB int `json:"memory_mb"` // per job; 0 = geen limiet
46 PidsLimit int `json:"pids_limit"` // per job; 0 = geen limiet
47 MaxDiskGB int `json:"max_disk_gb"`
48 PullPolicy string `json:"pull_policy"`
49 CleanupWork bool `json:"cleanup_work"`
50 PruneDangling bool `json:"prune_dangling"`
51 PruneCacheGB int `json:"prune_cache_gb"`
52 JobTimeoutMin int `json:"job_timeout_min"` // 0 = wat de job/server zegt
53 Labels []string `json:"labels"`
54 Presets []Preset `json:"presets"`
55 Paused bool `json:"paused"`
56}
57
58// Defaults zijn veilige standaardwaarden, ook zonder hardwaredetectie.
59func Defaults() Settings {
60 return Settings{
61 Concurrency: 1, MaxImages: 20, MemoryMB: 0, CPUs: 0, PidsLimit: 0,
62 MaxDiskGB: 0, PullPolicy: PullIfNotPresent, CleanupWork: true,
63 PruneDangling: true, PruneCacheGB: 10,
64 }
65}
66
67var labelRE = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,62}$`)
68var nameRE = regexp.MustCompile(`^[\pL\pN][\pL\pN ._-]{0,62}$`)
69
70// Validate geeft een vertaalbare fout (sleutel uit de catalogus rui.err.*).
71func (s *Settings) Validate() error {
72 s.Name = strings.TrimSpace(s.Name)
73 if s.Name != "" && !nameRE.MatchString(s.Name) {
74 return Err("rui.err.name")
75 }
76 if s.Concurrency < 1 || s.Concurrency > 64 {
77 return Err("rui.err.concurrency")
78 }
79 if s.MaxImages < 1 || s.MaxImages > 1000 {
80 return Err("rui.err.images")
81 }
82 if s.CPUs < 0 || s.CPUs > 512 || s.MemoryMB < 0 || s.PidsLimit < 0 || s.MaxDiskGB < 0 || s.PruneCacheGB < 0 || s.JobTimeoutMin < 0 {
83 return Err("rui.err.limits")
84 }
85 if s.MemoryMB > 0 && s.MemoryMB < 64 {
86 return Err("rui.err.memory")
87 }
88 switch s.PullPolicy {
89 case "":
90 s.PullPolicy = PullIfNotPresent
91 case PullIfNotPresent, PullAlways, PullNever:
92 default:
93 return Err("rui.err.pull")
94 }
95 var labels []string
96 seen := map[string]bool{}
97 for _, l := range s.Labels {
98 l = strings.TrimSpace(l)
99 if l == "" || seen[l] {
100 continue
101 }
102 if !labelRE.MatchString(l) {
103 return Err("rui.err.label", l)
104 }
105 seen[l] = true
106 labels = append(labels, l)
107 }
108 s.Labels = labels
109 names := map[string]bool{}
110 for i := range s.Presets {
111 p := &s.Presets[i]
112 if err := p.Validate(); err != nil {
113 return err
114 }
115 if names[p.Name] {
116 return Err("rui.err.presetDup", p.Name)
117 }
118 names[p.Name] = true
119 }
120 return nil
121}
122
123// Validate keurt één eigen preset goed (dezelfde regels als ci.presets).
124func (p *Preset) Validate() error {
125 p.Name = strings.TrimSpace(strings.ToLower(p.Name))
126 p.Image, p.From = strings.TrimSpace(p.Image), strings.TrimSpace(p.From)
127 p.Dockerfile = strings.TrimSpace(strings.ReplaceAll(p.Dockerfile, "\r\n", "\n"))
128 if p.Image == "" && p.Dockerfile == "" && p.From == "" {
129 return Err("rui.err.presetEmpty", p.Name)
130 }
131 if p.Image != "" && (p.Dockerfile != "" || p.From != "") {
132 return Err("rui.err.presetBoth", p.Name)
133 }
134 if p.From != "" && p.Dockerfile == "" && !images.Known(p.Name) {
135 return Err("rui.err.presetFrom", p.Name)
136 }
137 if p.Dockerfile != "" && !strings.Contains(strings.ToUpper(p.Dockerfile), "FROM ") {
138 return Err("rui.err.presetDockerfile", p.Name)
139 }
140 o := images.Override{Image: p.Image, From: p.From}
141 if p.Dockerfile != "" {
142 o.Dockerfile = os.DevNull // bestaat; de echte tekst wordt later weggeschreven
143 }
144 if err := images.ValidateOverride(p.Name, o, images.Known(p.Name)); err != nil {
145 return Err("rui.err.preset", p.Name, err.Error())
146 }
147 return nil
148}
149
150// RunArgs zijn de extra `docker run`-argumenten voor de limieten per job.
151func (s Settings) RunArgs() []string {
152 var out []string
153 if s.CPUs > 0 {
154 out = append(out, "--cpus", trimFloat(s.CPUs))
155 }
156 if s.MemoryMB > 0 {
157 out = append(out, "--memory", fmt.Sprintf("%dm", s.MemoryMB))
158 }
159 if s.PidsLimit > 0 {
160 out = append(out, "--pids-limit", fmt.Sprint(s.PidsLimit))
161 }
162 return out
163}
164
165func trimFloat(f float64) string {
166 return strings.TrimRight(strings.TrimRight(fmt.Sprintf("%.2f", f), "0"), ".")
167}
168
169// Overrides schrijft de Dockerfiles van eigen presets naar dir en geeft
170// de aliassen zoals images.Effective ze wil. base zijn de presets uit de
171// configuratie (ci.presets); eigen presets uit de UI gaan voor.
172func (s Settings) Overrides(dir string, base map[string]images.Override) (map[string]images.Override, error) {
173 out := map[string]images.Override{}
174 for k, v := range base {
175 out[k] = v
176 }
177 for _, p := range s.Presets {
178 o := images.Override{Image: p.Image, From: p.From}
179 if p.Dockerfile != "" {
180 pd := filepath.Join(dir, "presets", strings.ReplaceAll(p.Name, "/", "__"))
181 if err := os.MkdirAll(pd, 0o755); err != nil {
182 return nil, err
183 }
184 f := filepath.Join(pd, "Dockerfile")
185 if err := os.WriteFile(f, []byte(p.Dockerfile+"\n"), 0o644); err != nil {
186 return nil, err
187 }
188 o.Dockerfile = f
189 }
190 out[p.Name] = o
191 }
192 return out, nil
193}
194
195// File bewaart Settings als JSON (schrijfbaar door de service, anders dan /etc).
196type File struct {
197 Path string
198 mu sync.Mutex
199}
200
201// Load leest de instellingen; een ontbrekend bestand geeft def.
202func (f *File) Load(def Settings) (Settings, error) {
203 f.mu.Lock()
204 defer f.mu.Unlock()
205 b, err := os.ReadFile(f.Path)
206 if errors.Is(err, os.ErrNotExist) {
207 return def, nil
208 }
209 if err != nil {
210 return def, err
211 }
212 s := def
213 if err := json.Unmarshal(b, &s); err != nil {
214 return def, fmt.Errorf("%s: %w", f.Path, err)
215 }
216 return s, nil
217}
218
219// Save schrijft atomair.
220func (f *File) Save(s Settings) error {
221 f.mu.Lock()
222 defer f.mu.Unlock()
223 sort.SliceStable(s.Presets, func(i, j int) bool { return s.Presets[i].Name < s.Presets[j].Name })
224 b, err := json.MarshalIndent(s, "", " ")
225 if err != nil {
226 return err
227 }
228 if err := os.MkdirAll(filepath.Dir(f.Path), 0o755); err != nil {
229 return err
230 }
231 tmp := f.Path + ".tmp"
232 if err := os.WriteFile(tmp, b, 0o600); err != nil {
233 return err
234 }
235 return os.Rename(tmp, f.Path)
236}
237
238// Error is een vertaalbare fout; Key staat in de i18n-catalogus.
239type Error struct {
240 Key string
241 Args []any
242}
243
244func (e Error) Error() string { return e.Key }
245
246// Err maakt een Error.
247func Err(key string, args ...any) error { return Error{Key: key, Args: args} }
internal/runnercfg/tracker.go added +135 −0
@@ -0,0 +1,135 @@
1 package runnercfg
2
3 import (
4 "sort"
5 "sync"
6 "time"
7 )
8
9 // JobInfo is één job in het overzicht.
10 type JobInfo struct {
11 ID int64 `json:"id"`
12 Name string `json:"name"`
13 Project string `json:"project"`
14 Pipeline int64 `json:"pipeline"`
15 Image string `json:"image"`
16 Status string `json:"status"`
17 Started time.Time `json:"started_at"`
18 Finished time.Time `json:"finished_at,omitempty"`
19 URL string `json:"url,omitempty"`
20 }
21
22 // Tracker houdt actieve en recente jobs en de pauze bij. Veilig voor
23 // gelijktijdig gebruik.
24 type Tracker struct {
25 mu sync.Mutex
26 active map[int64]JobInfo
27 recent []JobInfo
28 paused bool
29 images map[string]time.Time
30 }
31
32 const recentMax = 25
33
34 // Start registreert een lopende job.
35 func (t *Tracker) Start(j JobInfo) {
36 t.mu.Lock()
37 defer t.mu.Unlock()
38 if t.active == nil {
39 t.active = map[int64]JobInfo{}
40 }
41 if j.Started.IsZero() {
42 j.Started = time.Now()
43 }
44 j.Status = "running"
45 t.active[j.ID] = j
46 if j.Image != "" {
47 if t.images == nil {
48 t.images = map[string]time.Time{}
49 }
50 t.images[j.Image] = time.Now()
51 }
52 }
53
54 // Finish zet een job bij de recente jobs.
55 func (t *Tracker) Finish(id int64, status string) {
56 t.mu.Lock()
57 defer t.mu.Unlock()
58 j, ok := t.active[id]
59 if !ok {
60 return
61 }
62 delete(t.active, id)
63 j.Status, j.Finished = status, time.Now()
64 t.recent = append([]JobInfo{j}, t.recent...)
65 if len(t.recent) > recentMax {
66 t.recent = t.recent[:recentMax]
67 }
68 }
69
70 // Active geeft de lopende jobs, oudste eerst.
71 func (t *Tracker) Active() []JobInfo {
72 t.mu.Lock()
73 defer t.mu.Unlock()
74 out := make([]JobInfo, 0, len(t.active))
75 for _, j := range t.active {
76 out = append(out, j)
77 }
78 sort.Slice(out, func(i, k int) bool { return out[i].Started.Before(out[k].Started) })
79 return out
80 }
81
82 // Recent geeft de laatst afgeronde jobs, nieuwste eerst.
83 func (t *Tracker) Recent() []JobInfo {
84 t.mu.Lock()
85 defer t.mu.Unlock()
86 return append([]JobInfo(nil), t.recent...)
87 }
88
89 // SetPaused zet de pauze (drain): lopende jobs lopen af, nieuwe niet.
90 func (t *Tracker) SetPaused(on bool) {
91 t.mu.Lock()
92 t.paused = on
93 t.mu.Unlock()
94 }
95
96 // Paused zegt of er geen nieuwe jobs opgepakt worden.
97 func (t *Tracker) Paused() bool {
98 t.mu.Lock()
99 defer t.mu.Unlock()
100 return t.paused
101 }
102
103 // SafeToUpgrade: niets loopt meer.
104 func (t *Tracker) SafeToUpgrade() bool {
105 t.mu.Lock()
106 defer t.mu.Unlock()
107 return len(t.active) == 0
108 }
109
110 // StaleImages geeft de images die het langst niet gebruikt zijn, boven keep.
111 func (t *Tracker) StaleImages(keep int) []string {
112 t.mu.Lock()
113 defer t.mu.Unlock()
114 type iu struct {
115 ref string
116 at time.Time
117 }
118 var all []iu
119 inUse := map[string]bool{}
120 for _, j := range t.active {
121 inUse[j.Image] = true
122 }
123 for ref, at := range t.images {
124 all = append(all, iu{ref, at})
125 }
126 sort.Slice(all, func(i, k int) bool { return all[i].at.After(all[k].at) })
127 var out []string
128 for i, x := range all {
129 if i >= keep && !inUse[x.ref] {
130 out = append(out, x.ref)
131 delete(t.images, x.ref)
132 }
133 }
134 return out
135 }
@@ -0,0 +1,135 @@
1package runnercfg
2
3import (
4 "sort"
5 "sync"
6 "time"
7)
8
9// JobInfo is één job in het overzicht.
10type JobInfo struct {
11 ID int64 `json:"id"`
12 Name string `json:"name"`
13 Project string `json:"project"`
14 Pipeline int64 `json:"pipeline"`
15 Image string `json:"image"`
16 Status string `json:"status"`
17 Started time.Time `json:"started_at"`
18 Finished time.Time `json:"finished_at,omitempty"`
19 URL string `json:"url,omitempty"`
20}
21
22// Tracker houdt actieve en recente jobs en de pauze bij. Veilig voor
23// gelijktijdig gebruik.
24type Tracker struct {
25 mu sync.Mutex
26 active map[int64]JobInfo
27 recent []JobInfo
28 paused bool
29 images map[string]time.Time
30}
31
32const recentMax = 25
33
34// Start registreert een lopende job.
35func (t *Tracker) Start(j JobInfo) {
36 t.mu.Lock()
37 defer t.mu.Unlock()
38 if t.active == nil {
39 t.active = map[int64]JobInfo{}
40 }
41 if j.Started.IsZero() {
42 j.Started = time.Now()
43 }
44 j.Status = "running"
45 t.active[j.ID] = j
46 if j.Image != "" {
47 if t.images == nil {
48 t.images = map[string]time.Time{}
49 }
50 t.images[j.Image] = time.Now()
51 }
52}
53
54// Finish zet een job bij de recente jobs.
55func (t *Tracker) Finish(id int64, status string) {
56 t.mu.Lock()
57 defer t.mu.Unlock()
58 j, ok := t.active[id]
59 if !ok {
60 return
61 }
62 delete(t.active, id)
63 j.Status, j.Finished = status, time.Now()
64 t.recent = append([]JobInfo{j}, t.recent...)
65 if len(t.recent) > recentMax {
66 t.recent = t.recent[:recentMax]
67 }
68}
69
70// Active geeft de lopende jobs, oudste eerst.
71func (t *Tracker) Active() []JobInfo {
72 t.mu.Lock()
73 defer t.mu.Unlock()
74 out := make([]JobInfo, 0, len(t.active))
75 for _, j := range t.active {
76 out = append(out, j)
77 }
78 sort.Slice(out, func(i, k int) bool { return out[i].Started.Before(out[k].Started) })
79 return out
80}
81
82// Recent geeft de laatst afgeronde jobs, nieuwste eerst.
83func (t *Tracker) Recent() []JobInfo {
84 t.mu.Lock()
85 defer t.mu.Unlock()
86 return append([]JobInfo(nil), t.recent...)
87}
88
89// SetPaused zet de pauze (drain): lopende jobs lopen af, nieuwe niet.
90func (t *Tracker) SetPaused(on bool) {
91 t.mu.Lock()
92 t.paused = on
93 t.mu.Unlock()
94}
95
96// Paused zegt of er geen nieuwe jobs opgepakt worden.
97func (t *Tracker) Paused() bool {
98 t.mu.Lock()
99 defer t.mu.Unlock()
100 return t.paused
101}
102
103// SafeToUpgrade: niets loopt meer.
104func (t *Tracker) SafeToUpgrade() bool {
105 t.mu.Lock()
106 defer t.mu.Unlock()
107 return len(t.active) == 0
108}
109
110// StaleImages geeft de images die het langst niet gebruikt zijn, boven keep.
111func (t *Tracker) StaleImages(keep int) []string {
112 t.mu.Lock()
113 defer t.mu.Unlock()
114 type iu struct {
115 ref string
116 at time.Time
117 }
118 var all []iu
119 inUse := map[string]bool{}
120 for _, j := range t.active {
121 inUse[j.Image] = true
122 }
123 for ref, at := range t.images {
124 all = append(all, iu{ref, at})
125 }
126 sort.Slice(all, func(i, k int) bool { return all[i].at.After(all[k].at) })
127 var out []string
128 for i, x := range all {
129 if i >= keep && !inUse[x.ref] {
130 out = append(out, x.ref)
131 delete(t.images, x.ref)
132 }
133 }
134 return out
135}
internal/runnercfg/ui_tmpl.go added +212 −0
@@ -0,0 +1,212 @@
1 package runnercfg
2
3 import (
4 "fmt"
5 "html/template"
6 "strings"
7 "sync"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 )
12
13 var (
14 tmplMu sync.Mutex
15 tmpls = map[i18n.Lang]*template.Template{}
16 )
17
18 func uiTmpl(lang i18n.Lang) *template.Template {
19 tmplMu.Lock()
20 defer tmplMu.Unlock()
21 if t := tmpls[lang]; t != nil {
22 return t
23 }
24 t := template.Must(template.New("ui").Funcs(Funcs(lang)).Parse(uiSource))
25 tmpls[lang] = t
26 return t
27 }
28
29 // Funcs zijn de sjabloonfuncties (t, ago, dur, join) voor lang.
30 func Funcs(lang i18n.Lang) template.FuncMap {
31 return template.FuncMap{
32 "t": func(key string, args ...any) string { return i18n.T(lang, key, args...) },
33 "ago": func(t time.Time) string { return i18n.Ago(lang, t.Unix()) },
34 "dur": func(a, b time.Time) string {
35 if b.IsZero() {
36 b = time.Now()
37 }
38 d := b.Sub(a).Round(time.Second)
39 if d < time.Minute {
40 return fmt.Sprintf("%ds", int(d.Seconds()))
41 }
42 return fmt.Sprintf("%dm%02ds", int(d.Minutes()), int(d.Seconds())%60)
43 },
44 "join": func(v []string) string { return strings.Join(v, ", ") },
45 "cpus": func(f float64) string {
46 if f <= 0 {
47 return ""
48 }
49 return trimFloat(f)
50 },
51 "num": func(n int) string {
52 if n <= 0 {
53 return ""
54 }
55 return fmt.Sprint(n)
56 },
57 "gb": func(mb int) string { return fmt.Sprintf("%.1f", float64(mb)/1024) },
58 "short": func(s string) string {
59 if len(s) > 60 {
60 return s[:57] + "…"
61 }
62 return s
63 },
64 }
65 }
66
67 const uiSource = `{{define "runnerui"}}
68 <div class="rui">
69 {{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
70 {{if .Problem}}<p class="flash bad">{{.Problem}}</p>{{end}}
71 <div class="rui-head">
72 <div>
73 <h1>{{if .Status.Name}}{{.Status.Name}}{{else}}{{t "rui.title"}}{{end}}</h1>
74 <p class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.leadBuiltin"}}{{else}}{{t "rui.lead"}}{{end}}</p>
75 </div>
76 <div class="rui-state">
77 {{if .S.Paused}}<span class="rui-badge warn">{{if .Active}}{{t "rui.state.draining"}}{{else}}{{t "rui.state.paused"}}{{end}}</span>
78 {{else if .Status.Online}}<span class="rui-badge ok">{{t "rui.state.online"}}</span>
79 {{else}}<span class="rui-badge bad">{{t "rui.state.offline"}}</span>{{end}}
80 </div>
81 </div>
82
83 <div class="rui-cards">
84 <section class="panel rui-card">
85 <h2>{{t "rui.status"}}</h2>
86 <dl class="rui-dl">
87 <dt>{{t "rui.version"}}</dt><dd><code>{{or .Status.Version "dev"}}</code></dd>
88 <dt>{{t "rui.server"}}</dt><dd>{{if .Status.ServerURL}}<a href="{{.Status.ServerURL}}">{{.Status.ServerURL}}</a>{{else}}—{{end}}</dd>
89 <dt>{{t "rui.contact"}}</dt><dd>{{if .Status.LastContact.IsZero}}—{{else}}{{ago .Status.LastContact}}{{end}}</dd>
90 {{if .Status.ServerPause}}<dt>{{t "rui.serverPause"}}</dt><dd><span class="pill">{{t "rui.state.paused"}}</span></dd>{{end}}
91 </dl>
92 </section>
93 <section class="panel rui-card">
94 <h2>{{t "rui.hardware"}}</h2>
95 <dl class="rui-dl">
96 <dt>{{t "rui.hw.cpu"}}</dt><dd>{{.HW.CPUs}}</dd>
97 <dt>{{t "rui.hw.mem"}}</dt><dd>{{gb .HW.MemoryMB}} GB</dd>
98 <dt>{{t "rui.hw.disk"}}</dt><dd>{{t "rui.hw.diskVal" .HW.DiskFree .HW.DiskSize}}</dd>
99 </dl>
100 </section>
101 <section class="panel rui-card rui-upgrade">
102 <h2>{{t "rui.upgrade"}}</h2>
103 <p class="rui-big">{{len .Active}} <span class="muted">{{t "rui.activeCount"}}</span></p>
104 {{if .Safe}}<p class="rui-safe ok">✓ {{t "rui.safe"}}</p>{{else}}<p class="rui-safe warn">⏳ {{t "rui.notSafe"}}</p>{{end}}
105 {{if .S.Paused}}
106 <form method="post" action="{{.Prefix}}/resume">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit">▶ {{t "rui.resume"}}</button></form>
107 {{else}}
108 <form method="post" action="{{.Prefix}}/pause" data-confirm="{{t "rui.pauseAsk"}}">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit" class="ghost">⏸ {{t "rui.pause"}}</button></form>
109 {{end}}
110 <p class="muted rui-small">{{t "rui.pauseHelp"}}</p>
111 </section>
112 </div>
113
114 <section class="panel">
115 <h2>{{t "rui.active"}}</h2>
116 {{if .Active}}
117 <div class="hscroll"><table class="rui-table">
118 <thead><tr><th>{{t "rui.col.job"}}</th><th>{{t "rui.col.project"}}</th><th>{{t "rui.col.image"}}</th><th>{{t "rui.col.duration"}}</th></tr></thead>
119 <tbody>{{range .Active}}<tr>
120 <td>{{if .URL}}<a href="{{.URL}}">#{{.ID}} {{.Name}}</a>{{else}}#{{.ID}} {{.Name}}{{end}}</td>
121 <td>{{.Project}}{{if .Pipeline}} <span class="muted">· {{t "rui.pipeline" .Pipeline}}</span>{{end}}</td>
122 <td><code>{{short .Image}}</code></td><td>{{dur .Started .Finished}}</td>
123 </tr>{{end}}</tbody>
124 </table></div>
125 {{else}}<p class="muted">{{t "rui.noActive"}}</p>{{end}}
126 <h3>{{t "rui.recent"}}</h3>
127 {{if .Recent}}
128 <div class="hscroll"><table class="rui-table">
129 <thead><tr><th>{{t "rui.col.job"}}</th><th>{{t "rui.col.project"}}</th><th>{{t "rui.col.status"}}</th><th>{{t "rui.col.duration"}}</th><th>{{t "rui.col.finished"}}</th></tr></thead>
130 <tbody>{{range .Recent}}<tr>
131 <td>{{if .URL}}<a href="{{.URL}}">#{{.ID}} {{.Name}}</a>{{else}}#{{.ID}} {{.Name}}{{end}}</td>
132 <td>{{.Project}}</td>
133 <td><span class="rui-st {{.Status}}">{{t (printf "rui.job.%s" .Status)}}</span></td>
134 <td>{{dur .Started .Finished}}</td><td>{{ago .Finished}}</td>
135 </tr>{{end}}</tbody>
136 </table></div>
137 {{else}}<p class="muted">{{t "rui.noRecent"}}</p>{{end}}
138 </section>
139
140 <section class="panel" id="settings">
141 <div class="rui-sechead">
142 <h2>{{t "rui.settings"}}</h2>
143 <form method="post" action="{{.Prefix}}/recommend">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit" class="ghost">✨ {{t "rui.applyRec"}}</button></form>
144 </div>
145 <p class="muted">{{t "rui.recLead"}}</p>
146 <form method="post" action="{{.Prefix}}/settings" class="rui-form">
147 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
148 <fieldset><legend>{{t "rui.grp.general"}}</legend>
149 <label>{{t "rui.f.name"}}<input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
150 <label>{{t "rui.f.labels"}}<input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
151 </fieldset>
152 <fieldset><legend>{{t "rui.grp.capacity"}}</legend>
153 <label>{{t "rui.f.concurrency"}}<input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
154 <label>{{t "rui.f.maxImages"}}<input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
155 <label>{{t "rui.f.timeout"}}<input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
156 </fieldset>
157 <fieldset><legend>{{t "rui.grp.limits"}}</legend>
158 <label>{{t "rui.f.cpus"}}<input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
159 <label>{{t "rui.f.memory"}}<input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
160 <label>{{t "rui.f.pids"}}<input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
161 <label>{{t "rui.f.disk"}}<input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
162 </fieldset>
163 <fieldset><legend>{{t "rui.grp.images"}}</legend>
164 <label>{{t "rui.f.pull"}}
165 <select name="pull_policy">
166 <option value="if-not-present"{{if eq .S.PullPolicy "if-not-present"}} selected{{end}}>{{t "rui.pull.ifNotPresent"}}</option>
167 <option value="always"{{if eq .S.PullPolicy "always"}} selected{{end}}>{{t "rui.pull.always"}}</option>
168 <option value="never"{{if eq .S.PullPolicy "never"}} selected{{end}}>{{t "rui.pull.never"}}</option>
169 </select><small class="muted">{{t "rui.h.pull"}}</small></label>
170 <label class="rui-check"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}}</label>
171 <label class="rui-check"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}}</label>
172 <label>{{t "rui.f.pruneCache"}}<input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
173 </fieldset>
174 <div class="rui-actions"><button type="submit">{{t "rui.save"}}</button></div>
175 </form>
176 </section>
177
178 <section class="panel" id="presets">
179 <h2>{{t "rui.presets"}}</h2>
180 <p class="muted">{{t "rui.presetsLead"}}</p>
181 <div class="hscroll"><table class="rui-table">
182 <thead><tr><th>{{t "rui.col.alias"}}</th><th>{{t "rui.col.base"}}</th><th>{{t "rui.col.kind"}}</th><th></th></tr></thead>
183 <tbody>
184 {{range .Builtin}}<tr><td><code>{{.Name}}</code></td><td><code>{{.From}}</code>{{if .Tools}} <span class="muted">· {{join .Tools}}</span>{{end}}</td><td><span class="pill">{{t "rui.kind.builtin"}}</span></td><td></td></tr>{{end}}
185 {{range .Config}}<tr><td><code>{{.}}</code></td><td class="muted">config.yml</td><td><span class="pill">{{t "rui.kind.config"}}</span></td><td></td></tr>{{end}}
186 {{range .S.Presets}}<tr><td><code>{{.Name}}</code>{{if .Note}}<br><small class="muted">{{.Note}}</small>{{end}}</td>
187 <td>{{if .Image}}<code>{{.Image}}</code>{{else if .From}}<code>{{.From}}</code>{{else}}<span class="muted">Dockerfile</span>{{end}}</td>
188 <td><span class="pill rui-own">{{t "rui.kind.own"}}</span></td>
189 <td class="act"><form method="post" action="{{$.Prefix}}/presets/delete" data-confirm="{{t "rui.presetDelAsk"}}">{{if $.CSRFField}}<input type="hidden" name="{{$.CSRFField}}" value="{{$.CSRF}}">{{end}}<input type="hidden" name="name" value="{{.Name}}"><button class="danger" type="submit">{{t "rui.delete"}}</button></form></td></tr>{{end}}
190 </tbody>
191 </table></div>
192 <details class="rui-add"{{if not .S.Presets}} open{{end}}>
193 <summary>{{t "rui.presetAdd"}}</summary>
194 <form method="post" action="{{.Prefix}}/presets" class="rui-form">
195 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
196 <fieldset>
197 <label>{{t "rui.f.alias"}}<input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
198 <label>{{t "rui.f.image"}}<input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
199 <label>{{t "rui.f.from"}}<input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
200 <label>{{t "rui.f.note"}}<input name="note" maxlength="120"></label>
201 <label class="rui-wide">{{t "rui.f.dockerfile"}}<textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
202 </fieldset>
203 <div class="rui-actions"><button type="submit">{{t "rui.presetSave"}}</button></div>
204 </form>
205 </details>
206 </section>
207
208 <section class="panel rui-foot">
209 <p>{{t "rui.docsLead"}} {{if .DocsURL}}<a href="{{.DocsURL}}">{{t "rui.docs"}}</a> · {{end}}<code>{{.APIBase}}/status</code></p>
210 </section>
211 </div>
212 {{end}}`
@@ -0,0 +1,212 @@
1package runnercfg
2
3import (
4 "fmt"
5 "html/template"
6 "strings"
7 "sync"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11)
12
13var (
14 tmplMu sync.Mutex
15 tmpls = map[i18n.Lang]*template.Template{}
16)
17
18func uiTmpl(lang i18n.Lang) *template.Template {
19 tmplMu.Lock()
20 defer tmplMu.Unlock()
21 if t := tmpls[lang]; t != nil {
22 return t
23 }
24 t := template.Must(template.New("ui").Funcs(Funcs(lang)).Parse(uiSource))
25 tmpls[lang] = t
26 return t
27}
28
29// Funcs zijn de sjabloonfuncties (t, ago, dur, join) voor lang.
30func Funcs(lang i18n.Lang) template.FuncMap {
31 return template.FuncMap{
32 "t": func(key string, args ...any) string { return i18n.T(lang, key, args...) },
33 "ago": func(t time.Time) string { return i18n.Ago(lang, t.Unix()) },
34 "dur": func(a, b time.Time) string {
35 if b.IsZero() {
36 b = time.Now()
37 }
38 d := b.Sub(a).Round(time.Second)
39 if d < time.Minute {
40 return fmt.Sprintf("%ds", int(d.Seconds()))
41 }
42 return fmt.Sprintf("%dm%02ds", int(d.Minutes()), int(d.Seconds())%60)
43 },
44 "join": func(v []string) string { return strings.Join(v, ", ") },
45 "cpus": func(f float64) string {
46 if f <= 0 {
47 return ""
48 }
49 return trimFloat(f)
50 },
51 "num": func(n int) string {
52 if n <= 0 {
53 return ""
54 }
55 return fmt.Sprint(n)
56 },
57 "gb": func(mb int) string { return fmt.Sprintf("%.1f", float64(mb)/1024) },
58 "short": func(s string) string {
59 if len(s) > 60 {
60 return s[:57] + "…"
61 }
62 return s
63 },
64 }
65}
66
67const uiSource = `{{define "runnerui"}}
68<div class="rui">
69{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
70{{if .Problem}}<p class="flash bad">{{.Problem}}</p>{{end}}
71<div class="rui-head">
72 <div>
73 <h1>{{if .Status.Name}}{{.Status.Name}}{{else}}{{t "rui.title"}}{{end}}</h1>
74 <p class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.leadBuiltin"}}{{else}}{{t "rui.lead"}}{{end}}</p>
75 </div>
76 <div class="rui-state">
77 {{if .S.Paused}}<span class="rui-badge warn">{{if .Active}}{{t "rui.state.draining"}}{{else}}{{t "rui.state.paused"}}{{end}}</span>
78 {{else if .Status.Online}}<span class="rui-badge ok">{{t "rui.state.online"}}</span>
79 {{else}}<span class="rui-badge bad">{{t "rui.state.offline"}}</span>{{end}}
80 </div>
81</div>
82
83<div class="rui-cards">
84 <section class="panel rui-card">
85 <h2>{{t "rui.status"}}</h2>
86 <dl class="rui-dl">
87 <dt>{{t "rui.version"}}</dt><dd><code>{{or .Status.Version "dev"}}</code></dd>
88 <dt>{{t "rui.server"}}</dt><dd>{{if .Status.ServerURL}}<a href="{{.Status.ServerURL}}">{{.Status.ServerURL}}</a>{{else}}—{{end}}</dd>
89 <dt>{{t "rui.contact"}}</dt><dd>{{if .Status.LastContact.IsZero}}—{{else}}{{ago .Status.LastContact}}{{end}}</dd>
90 {{if .Status.ServerPause}}<dt>{{t "rui.serverPause"}}</dt><dd><span class="pill">{{t "rui.state.paused"}}</span></dd>{{end}}
91 </dl>
92 </section>
93 <section class="panel rui-card">
94 <h2>{{t "rui.hardware"}}</h2>
95 <dl class="rui-dl">
96 <dt>{{t "rui.hw.cpu"}}</dt><dd>{{.HW.CPUs}}</dd>
97 <dt>{{t "rui.hw.mem"}}</dt><dd>{{gb .HW.MemoryMB}} GB</dd>
98 <dt>{{t "rui.hw.disk"}}</dt><dd>{{t "rui.hw.diskVal" .HW.DiskFree .HW.DiskSize}}</dd>
99 </dl>
100 </section>
101 <section class="panel rui-card rui-upgrade">
102 <h2>{{t "rui.upgrade"}}</h2>
103 <p class="rui-big">{{len .Active}} <span class="muted">{{t "rui.activeCount"}}</span></p>
104 {{if .Safe}}<p class="rui-safe ok">✓ {{t "rui.safe"}}</p>{{else}}<p class="rui-safe warn">⏳ {{t "rui.notSafe"}}</p>{{end}}
105 {{if .S.Paused}}
106 <form method="post" action="{{.Prefix}}/resume">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit">▶ {{t "rui.resume"}}</button></form>
107 {{else}}
108 <form method="post" action="{{.Prefix}}/pause" data-confirm="{{t "rui.pauseAsk"}}">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit" class="ghost">⏸ {{t "rui.pause"}}</button></form>
109 {{end}}
110 <p class="muted rui-small">{{t "rui.pauseHelp"}}</p>
111 </section>
112</div>
113
114<section class="panel">
115 <h2>{{t "rui.active"}}</h2>
116 {{if .Active}}
117 <div class="hscroll"><table class="rui-table">
118 <thead><tr><th>{{t "rui.col.job"}}</th><th>{{t "rui.col.project"}}</th><th>{{t "rui.col.image"}}</th><th>{{t "rui.col.duration"}}</th></tr></thead>
119 <tbody>{{range .Active}}<tr>
120 <td>{{if .URL}}<a href="{{.URL}}">#{{.ID}} {{.Name}}</a>{{else}}#{{.ID}} {{.Name}}{{end}}</td>
121 <td>{{.Project}}{{if .Pipeline}} <span class="muted">· {{t "rui.pipeline" .Pipeline}}</span>{{end}}</td>
122 <td><code>{{short .Image}}</code></td><td>{{dur .Started .Finished}}</td>
123 </tr>{{end}}</tbody>
124 </table></div>
125 {{else}}<p class="muted">{{t "rui.noActive"}}</p>{{end}}
126 <h3>{{t "rui.recent"}}</h3>
127 {{if .Recent}}
128 <div class="hscroll"><table class="rui-table">
129 <thead><tr><th>{{t "rui.col.job"}}</th><th>{{t "rui.col.project"}}</th><th>{{t "rui.col.status"}}</th><th>{{t "rui.col.duration"}}</th><th>{{t "rui.col.finished"}}</th></tr></thead>
130 <tbody>{{range .Recent}}<tr>
131 <td>{{if .URL}}<a href="{{.URL}}">#{{.ID}} {{.Name}}</a>{{else}}#{{.ID}} {{.Name}}{{end}}</td>
132 <td>{{.Project}}</td>
133 <td><span class="rui-st {{.Status}}">{{t (printf "rui.job.%s" .Status)}}</span></td>
134 <td>{{dur .Started .Finished}}</td><td>{{ago .Finished}}</td>
135 </tr>{{end}}</tbody>
136 </table></div>
137 {{else}}<p class="muted">{{t "rui.noRecent"}}</p>{{end}}
138</section>
139
140<section class="panel" id="settings">
141 <div class="rui-sechead">
142 <h2>{{t "rui.settings"}}</h2>
143 <form method="post" action="{{.Prefix}}/recommend">{{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}<button type="submit" class="ghost">✨ {{t "rui.applyRec"}}</button></form>
144 </div>
145 <p class="muted">{{t "rui.recLead"}}</p>
146 <form method="post" action="{{.Prefix}}/settings" class="rui-form">
147 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
148 <fieldset><legend>{{t "rui.grp.general"}}</legend>
149 <label>{{t "rui.f.name"}}<input name="name" value="{{.S.Name}}" maxlength="63" placeholder="{{.Status.Name}}"><small class="muted">{{if eq .Status.Kind "builtin"}}{{t "rui.h.nameBuiltin"}}{{else}}{{t "rui.h.name"}}{{end}}</small></label>
150 <label>{{t "rui.f.labels"}}<input name="labels" value="{{join .S.Labels}}" placeholder="docker, linux, gpu"><small class="muted">{{t "rui.h.labels"}}</small></label>
151 </fieldset>
152 <fieldset><legend>{{t "rui.grp.capacity"}}</legend>
153 <label>{{t "rui.f.concurrency"}}<input type="number" min="1" max="64" name="concurrency" value="{{.S.Concurrency}}"><small class="rui-rec">{{t "rui.rec" .Rec.Concurrency}}</small></label>
154 <label>{{t "rui.f.maxImages"}}<input type="number" min="1" max="1000" name="max_images" value="{{.S.MaxImages}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxImages}}</small></label>
155 <label>{{t "rui.f.timeout"}}<input type="number" min="0" name="job_timeout_min" value="{{num .S.JobTimeoutMin}}" placeholder="{{t "rui.unlimited"}}"><small class="muted">{{t "rui.h.timeout"}}</small></label>
156 </fieldset>
157 <fieldset><legend>{{t "rui.grp.limits"}}</legend>
158 <label>{{t "rui.f.cpus"}}<input inputmode="decimal" name="cpus" value="{{cpus .S.CPUs}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" (cpus .Rec.CPUs)}}</small></label>
159 <label>{{t "rui.f.memory"}}<input type="number" min="0" step="64" name="memory_mb" value="{{num .S.MemoryMB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MemoryMB}}</small></label>
160 <label>{{t "rui.f.pids"}}<input type="number" min="0" name="pids_limit" value="{{num .S.PidsLimit}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PidsLimit}}</small></label>
161 <label>{{t "rui.f.disk"}}<input type="number" min="0" name="max_disk_gb" value="{{num .S.MaxDiskGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.MaxDiskGB}} · {{t "rui.h.disk"}}</small></label>
162 </fieldset>
163 <fieldset><legend>{{t "rui.grp.images"}}</legend>
164 <label>{{t "rui.f.pull"}}
165 <select name="pull_policy">
166 <option value="if-not-present"{{if eq .S.PullPolicy "if-not-present"}} selected{{end}}>{{t "rui.pull.ifNotPresent"}}</option>
167 <option value="always"{{if eq .S.PullPolicy "always"}} selected{{end}}>{{t "rui.pull.always"}}</option>
168 <option value="never"{{if eq .S.PullPolicy "never"}} selected{{end}}>{{t "rui.pull.never"}}</option>
169 </select><small class="muted">{{t "rui.h.pull"}}</small></label>
170 <label class="rui-check"><input type="checkbox" name="cleanup_work"{{if .S.CleanupWork}} checked{{end}}> {{t "rui.f.cleanupWork"}}</label>
171 <label class="rui-check"><input type="checkbox" name="prune_dangling"{{if .S.PruneDangling}} checked{{end}}> {{t "rui.f.pruneDangling"}}</label>
172 <label>{{t "rui.f.pruneCache"}}<input type="number" min="0" name="prune_cache_gb" value="{{num .S.PruneCacheGB}}" placeholder="{{t "rui.unlimited"}}"><small class="rui-rec">{{t "rui.rec" .Rec.PruneCacheGB}}</small></label>
173 </fieldset>
174 <div class="rui-actions"><button type="submit">{{t "rui.save"}}</button></div>
175 </form>
176</section>
177
178<section class="panel" id="presets">
179 <h2>{{t "rui.presets"}}</h2>
180 <p class="muted">{{t "rui.presetsLead"}}</p>
181 <div class="hscroll"><table class="rui-table">
182 <thead><tr><th>{{t "rui.col.alias"}}</th><th>{{t "rui.col.base"}}</th><th>{{t "rui.col.kind"}}</th><th></th></tr></thead>
183 <tbody>
184 {{range .Builtin}}<tr><td><code>{{.Name}}</code></td><td><code>{{.From}}</code>{{if .Tools}} <span class="muted">· {{join .Tools}}</span>{{end}}</td><td><span class="pill">{{t "rui.kind.builtin"}}</span></td><td></td></tr>{{end}}
185 {{range .Config}}<tr><td><code>{{.}}</code></td><td class="muted">config.yml</td><td><span class="pill">{{t "rui.kind.config"}}</span></td><td></td></tr>{{end}}
186 {{range .S.Presets}}<tr><td><code>{{.Name}}</code>{{if .Note}}<br><small class="muted">{{.Note}}</small>{{end}}</td>
187 <td>{{if .Image}}<code>{{.Image}}</code>{{else if .From}}<code>{{.From}}</code>{{else}}<span class="muted">Dockerfile</span>{{end}}</td>
188 <td><span class="pill rui-own">{{t "rui.kind.own"}}</span></td>
189 <td class="act"><form method="post" action="{{$.Prefix}}/presets/delete" data-confirm="{{t "rui.presetDelAsk"}}">{{if $.CSRFField}}<input type="hidden" name="{{$.CSRFField}}" value="{{$.CSRF}}">{{end}}<input type="hidden" name="name" value="{{.Name}}"><button class="danger" type="submit">{{t "rui.delete"}}</button></form></td></tr>{{end}}
190 </tbody>
191 </table></div>
192 <details class="rui-add"{{if not .S.Presets}} open{{end}}>
193 <summary>{{t "rui.presetAdd"}}</summary>
194 <form method="post" action="{{.Prefix}}/presets" class="rui-form">
195 {{if .CSRFField}}<input type="hidden" name="{{.CSRFField}}" value="{{.CSRF}}">{{end}}
196 <fieldset>
197 <label>{{t "rui.f.alias"}}<input name="name" required placeholder="team/tools" pattern="[a-z0-9._/-]+"><small class="muted">{{t "rui.h.alias"}}</small></label>
198 <label>{{t "rui.f.image"}}<input name="image" placeholder="node:22-alpine"><small class="muted">{{t "rui.h.image"}}</small></label>
199 <label>{{t "rui.f.from"}}<input name="from" placeholder="debian:bookworm-slim"><small class="muted">{{t "rui.h.from"}}</small></label>
200 <label>{{t "rui.f.note"}}<input name="note" maxlength="120"></label>
201 <label class="rui-wide">{{t "rui.f.dockerfile"}}<textarea name="dockerfile" rows="6" placeholder="FROM debian:bookworm-slim&#10;RUN apt-get update &amp;&amp; apt-get install -y git make"></textarea><small class="muted">{{t "rui.h.dockerfile"}}</small></label>
202 </fieldset>
203 <div class="rui-actions"><button type="submit">{{t "rui.presetSave"}}</button></div>
204 </form>
205 </details>
206</section>
207
208<section class="panel rui-foot">
209 <p>{{t "rui.docsLead"}} {{if .DocsURL}}<a href="{{.DocsURL}}">{{t "rui.docs"}}</a> · {{end}}<code>{{.APIBase}}/status</code></p>
210</section>
211</div>
212{{end}}`
internal/server/admin_runner.go added +189 −0
@@ -0,0 +1,189 @@
1 package server
2
3 import (
4 "context"
5 "html/template"
6 "net/http"
7 "path/filepath"
8 "strings"
9 "time"
10
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/runnercfg"
13 "gitlab.com/Timfa/bluegit/internal/update"
14 )
15
16 // Beheer van de ingebouwde runner (Steve) door de sitebeheerder: dezelfde
17 // instellingen en hetzelfde scherm als de webinterface van bluegit-runner.
18 // UI op /admin/runner, API op /api/v1/admin/runner/... (beheerder-token).
19 // Pauze is een drain: lopende jobs lopen af, nieuwe blijven queued (of
20 // gaan naar een andere runner). De self-update wacht alleen op running
21 // jobs, dus een gepauzeerde runner houdt een update niet tegen.
22
23 func (s *Server) runnerSettingsFile() *runnercfg.File {
24 dir := s.StateDir
25 if dir == "" {
26 dir = s.StoragePath()
27 }
28 return &runnercfg.File{Path: filepath.Join(dir, "runner-settings.json")}
29 }
30
31 func (s *Server) builtinDefaults() runnercfg.Settings {
32 d := runnercfg.Defaults()
33 if s.Cfg.CI.Concurrency > 0 {
34 d.Concurrency = s.Cfg.CI.Concurrency
35 }
36 return d
37 }
38
39 func (s *Server) runnerWorkDir() string {
40 if p := s.StoragePath(); p != "" {
41 return p
42 }
43 return s.StateDir
44 }
45
46 // ApplyRunnerSettings laadt de opgeslagen instellingen en zet ze live.
47 // Aan te roepen bij het starten, nadat Runner gezet is.
48 func (s *Server) ApplyRunnerSettings() error {
49 if s.Runner == nil {
50 return nil
51 }
52 if s.Runner.Jobs == nil {
53 s.Runner.Jobs = &runnercfg.Tracker{}
54 }
55 st, err := s.runnerSettingsFile().Load(s.builtinDefaults())
56 if err != nil {
57 return err
58 }
59 return s.applyBuiltin(st)
60 }
61
62 func (s *Server) applyBuiltin(st runnercfg.Settings) error {
63 if s.Runner == nil {
64 return nil
65 }
66 over, err := st.Overrides(filepath.Join(s.runnerWorkDir(), "runner"), s.Cfg.CI.ImageOverrides())
67 if err != nil {
68 return err
69 }
70 s.Runner.Configure(st, over)
71 return nil
72 }
73
74 // RunnerMaintenance voert elke 10 minuten het opruimbeleid uit.
75 func (s *Server) RunnerMaintenance(ctx context.Context) {
76 t := time.NewTicker(10 * time.Minute)
77 defer t.Stop()
78 for {
79 select {
80 case <-ctx.Done():
81 return
82 case <-t.C:
83 if s.Runner == nil {
84 continue
85 }
86 st, _ := s.runnerSettingsFile().Load(s.builtinDefaults())
87 runnercfg.Cleanup(ctx, s.Cfg.CI.Docker, st, s.Runner.Jobs, filepath.Join(s.runnerWorkDir(), "cache"))
88 }
89 }
90 }
91
92 func (s *Server) builtinStatus() runnercfg.Status {
93 st := runnercfg.Status{Kind: "builtin", ServerURL: s.Cfg.BaseURL, Online: s.Runner != nil, LastContact: time.Now()}
94 if s.Runner != nil {
95 st.Name = s.Runner.BuiltinName()
96 }
97 if s.StateDir != "" {
98 if u, err := update.ReadStatus(s.StateDir); err == nil && u.SHA != "" {
99 st.Version = shortSHA(u.SHA)
100 }
101 }
102 return st
103 }
104
105 func (s *Server) runnerAdmin() *runnercfg.Handler {
106 return &runnercfg.Handler{
107 Prefix: "/admin/runner",
108 APIBase: "/api/v1/admin/runner",
109 File: s.runnerSettingsFile(),
110 Default: s.builtinDefaults(),
111 Tracker: s.builtinTracker(),
112 WorkDir: s.runnerWorkDir(),
113 BasePresets: s.Cfg.CI.ImageOverrides(),
114 Apply: s.applyBuiltin,
115 Status: s.builtinStatus,
116 DocsURL: "/help/runners#ingebouwde-runner",
117 Lang: s.langOf,
118 Auth: func(w http.ResponseWriter, r *http.Request, write bool) bool {
119 if strings.HasPrefix(r.URL.Path, "/api/") {
120 if !apiUser(r).InstanceAdmin {
121 writeJSON(w, http.StatusForbidden, map[string]string{"message": "instance admin only"})
122 return false
123 }
124 } else if ok, _ := s.adminOnly(w, r); !ok {
125 return false
126 }
127 if s.Runner == nil {
128 http.Error(w, s.tr(r, "rui.ciOff"), http.StatusNotFound)
129 return false
130 }
131 return true
132 },
133 CSRF: func(r *http.Request) (string, string) { return "csrf", s.who(r).Session.CSRF },
134 CheckCSRF: func(r *http.Request) bool {
135 p := s.who(r)
136 return p.OK && r.FormValue("csrf") != "" && r.FormValue("csrf") == p.Session.CSRF
137 },
138 Layout: func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
139 v := s.view(w, r, title)
140 v.Page = "adminrunner"
141 v.Wide = true
142 v.RunnerUI = body
143 s.render(w, "adminrunner", v)
144 },
145 }
146 }
147
148 func (s *Server) builtinTracker() *runnercfg.Tracker {
149 if s.Runner == nil {
150 return &runnercfg.Tracker{}
151 }
152 if s.Runner.Jobs == nil {
153 s.Runner.Jobs = &runnercfg.Tracker{}
154 }
155 return s.Runner.Jobs
156 }
157
158 func (s *Server) apiAdminRunnerStatus(w http.ResponseWriter, r *http.Request) {
159 s.runnerAdmin().APIStatus(w, r)
160 }
161 func (s *Server) apiAdminRunnerSettings(w http.ResponseWriter, r *http.Request) {
162 s.runnerAdmin().APISettings(w, r)
163 }
164 func (s *Server) apiAdminRunnerJobs(w http.ResponseWriter, r *http.Request) {
165 s.runnerAdmin().APIJobs(w, r)
166 }
167 func (s *Server) apiAdminRunnerPause(w http.ResponseWriter, r *http.Request) {
168 s.runnerAdmin().APIPause(true)(w, r)
169 }
170 func (s *Server) apiAdminRunnerResume(w http.ResponseWriter, r *http.Request) {
171 s.runnerAdmin().APIPause(false)(w, r)
172 }
173
174 // mountRunnerAdmin hangt de UI-routes op. De API zit in apiCatalog.
175 func (s *Server) mountRunnerAdmin(mux *http.ServeMux) {
176 h := &lazyRunnerAdmin{s: s}
177 for _, p := range []string{"GET /admin/runner", "POST /admin/runner/settings", "POST /admin/runner/recommend", "POST /admin/runner/presets", "POST /admin/runner/presets/delete", "POST /admin/runner/pause", "POST /admin/runner/resume"} {
178 mux.Handle(p, h)
179 }
180 }
181
182 // lazyRunnerAdmin bouwt de handler per verzoek: s.Runner wordt pas na Handler() gezet.
183 type lazyRunnerAdmin struct{ s *Server }
184
185 func (l *lazyRunnerAdmin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
186 m := http.NewServeMux()
187 l.s.runnerAdmin().Mount(m, false)
188 m.ServeHTTP(w, r)
189 }
@@ -0,0 +1,189 @@
1package server
2
3import (
4 "context"
5 "html/template"
6 "net/http"
7 "path/filepath"
8 "strings"
9 "time"
10
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/runnercfg"
13 "gitlab.com/Timfa/bluegit/internal/update"
14)
15
16// Beheer van de ingebouwde runner (Steve) door de sitebeheerder: dezelfde
17// instellingen en hetzelfde scherm als de webinterface van bluegit-runner.
18// UI op /admin/runner, API op /api/v1/admin/runner/... (beheerder-token).
19// Pauze is een drain: lopende jobs lopen af, nieuwe blijven queued (of
20// gaan naar een andere runner). De self-update wacht alleen op running
21// jobs, dus een gepauzeerde runner houdt een update niet tegen.
22
23func (s *Server) runnerSettingsFile() *runnercfg.File {
24 dir := s.StateDir
25 if dir == "" {
26 dir = s.StoragePath()
27 }
28 return &runnercfg.File{Path: filepath.Join(dir, "runner-settings.json")}
29}
30
31func (s *Server) builtinDefaults() runnercfg.Settings {
32 d := runnercfg.Defaults()
33 if s.Cfg.CI.Concurrency > 0 {
34 d.Concurrency = s.Cfg.CI.Concurrency
35 }
36 return d
37}
38
39func (s *Server) runnerWorkDir() string {
40 if p := s.StoragePath(); p != "" {
41 return p
42 }
43 return s.StateDir
44}
45
46// ApplyRunnerSettings laadt de opgeslagen instellingen en zet ze live.
47// Aan te roepen bij het starten, nadat Runner gezet is.
48func (s *Server) ApplyRunnerSettings() error {
49 if s.Runner == nil {
50 return nil
51 }
52 if s.Runner.Jobs == nil {
53 s.Runner.Jobs = &runnercfg.Tracker{}
54 }
55 st, err := s.runnerSettingsFile().Load(s.builtinDefaults())
56 if err != nil {
57 return err
58 }
59 return s.applyBuiltin(st)
60}
61
62func (s *Server) applyBuiltin(st runnercfg.Settings) error {
63 if s.Runner == nil {
64 return nil
65 }
66 over, err := st.Overrides(filepath.Join(s.runnerWorkDir(), "runner"), s.Cfg.CI.ImageOverrides())
67 if err != nil {
68 return err
69 }
70 s.Runner.Configure(st, over)
71 return nil
72}
73
74// RunnerMaintenance voert elke 10 minuten het opruimbeleid uit.
75func (s *Server) RunnerMaintenance(ctx context.Context) {
76 t := time.NewTicker(10 * time.Minute)
77 defer t.Stop()
78 for {
79 select {
80 case <-ctx.Done():
81 return
82 case <-t.C:
83 if s.Runner == nil {
84 continue
85 }
86 st, _ := s.runnerSettingsFile().Load(s.builtinDefaults())
87 runnercfg.Cleanup(ctx, s.Cfg.CI.Docker, st, s.Runner.Jobs, filepath.Join(s.runnerWorkDir(), "cache"))
88 }
89 }
90}
91
92func (s *Server) builtinStatus() runnercfg.Status {
93 st := runnercfg.Status{Kind: "builtin", ServerURL: s.Cfg.BaseURL, Online: s.Runner != nil, LastContact: time.Now()}
94 if s.Runner != nil {
95 st.Name = s.Runner.BuiltinName()
96 }
97 if s.StateDir != "" {
98 if u, err := update.ReadStatus(s.StateDir); err == nil && u.SHA != "" {
99 st.Version = shortSHA(u.SHA)
100 }
101 }
102 return st
103}
104
105func (s *Server) runnerAdmin() *runnercfg.Handler {
106 return &runnercfg.Handler{
107 Prefix: "/admin/runner",
108 APIBase: "/api/v1/admin/runner",
109 File: s.runnerSettingsFile(),
110 Default: s.builtinDefaults(),
111 Tracker: s.builtinTracker(),
112 WorkDir: s.runnerWorkDir(),
113 BasePresets: s.Cfg.CI.ImageOverrides(),
114 Apply: s.applyBuiltin,
115 Status: s.builtinStatus,
116 DocsURL: "/help/runners#ingebouwde-runner",
117 Lang: s.langOf,
118 Auth: func(w http.ResponseWriter, r *http.Request, write bool) bool {
119 if strings.HasPrefix(r.URL.Path, "/api/") {
120 if !apiUser(r).InstanceAdmin {
121 writeJSON(w, http.StatusForbidden, map[string]string{"message": "instance admin only"})
122 return false
123 }
124 } else if ok, _ := s.adminOnly(w, r); !ok {
125 return false
126 }
127 if s.Runner == nil {
128 http.Error(w, s.tr(r, "rui.ciOff"), http.StatusNotFound)
129 return false
130 }
131 return true
132 },
133 CSRF: func(r *http.Request) (string, string) { return "csrf", s.who(r).Session.CSRF },
134 CheckCSRF: func(r *http.Request) bool {
135 p := s.who(r)
136 return p.OK && r.FormValue("csrf") != "" && r.FormValue("csrf") == p.Session.CSRF
137 },
138 Layout: func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML) {
139 v := s.view(w, r, title)
140 v.Page = "adminrunner"
141 v.Wide = true
142 v.RunnerUI = body
143 s.render(w, "adminrunner", v)
144 },
145 }
146}
147
148func (s *Server) builtinTracker() *runnercfg.Tracker {
149 if s.Runner == nil {
150 return &runnercfg.Tracker{}
151 }
152 if s.Runner.Jobs == nil {
153 s.Runner.Jobs = &runnercfg.Tracker{}
154 }
155 return s.Runner.Jobs
156}
157
158func (s *Server) apiAdminRunnerStatus(w http.ResponseWriter, r *http.Request) {
159 s.runnerAdmin().APIStatus(w, r)
160}
161func (s *Server) apiAdminRunnerSettings(w http.ResponseWriter, r *http.Request) {
162 s.runnerAdmin().APISettings(w, r)
163}
164func (s *Server) apiAdminRunnerJobs(w http.ResponseWriter, r *http.Request) {
165 s.runnerAdmin().APIJobs(w, r)
166}
167func (s *Server) apiAdminRunnerPause(w http.ResponseWriter, r *http.Request) {
168 s.runnerAdmin().APIPause(true)(w, r)
169}
170func (s *Server) apiAdminRunnerResume(w http.ResponseWriter, r *http.Request) {
171 s.runnerAdmin().APIPause(false)(w, r)
172}
173
174// mountRunnerAdmin hangt de UI-routes op. De API zit in apiCatalog.
175func (s *Server) mountRunnerAdmin(mux *http.ServeMux) {
176 h := &lazyRunnerAdmin{s: s}
177 for _, p := range []string{"GET /admin/runner", "POST /admin/runner/settings", "POST /admin/runner/recommend", "POST /admin/runner/presets", "POST /admin/runner/presets/delete", "POST /admin/runner/pause", "POST /admin/runner/resume"} {
178 mux.Handle(p, h)
179 }
180}
181
182// lazyRunnerAdmin bouwt de handler per verzoek: s.Runner wordt pas na Handler() gezet.
183type lazyRunnerAdmin struct{ s *Server }
184
185func (l *lazyRunnerAdmin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
186 m := http.NewServeMux()
187 l.s.runnerAdmin().Mount(m, false)
188 m.ServeHTTP(w, r)
189}
internal/server/admin_runner_test.go added +206 −0
@@ -0,0 +1,206 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "io"
7 "net/http"
8 "net/http/cookiejar"
9 "net/url"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/runnercfg"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func sessionClient(t *testing.T, st *store.Store, base string, uid int64) (*http.Client, string) {
19 t.Helper()
20 sess, err := st.CreateSession(context.Background(), uid, "dev", time.Now().Add(time.Hour))
21 if err != nil {
22 t.Fatal(err)
23 }
24 jar, _ := cookiejar.New(nil)
25 u, _ := url.Parse(base)
26 jar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
27 c := &http.Client{Jar: jar, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
28 return c, sess.CSRF
29 }
30
31 func body(t *testing.T, res *http.Response) string {
32 t.Helper()
33 defer res.Body.Close()
34 b, _ := io.ReadAll(res.Body)
35 return string(b)
36 }
37
38 func TestAdminRunnerOnlyForInstanceAdmin(t *testing.T) {
39 e := newCIEnv(t)
40 ctx := context.Background()
41 st, base := e.st, e.ts.URL
42 tim, _ := st.UserByID(ctx, e.user.ID)
43 if !tim.InstanceAdmin {
44 t.Skip("eerste gebruiker is geen beheerder in deze opzet")
45 }
46 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
47 if err := e.srv.ApplyRunnerSettings(); err != nil {
48 t.Fatal(err)
49 }
50
51 // Niet-beheerder: UI 403, API 403, ook met scope api.
52 bc, bcsrf := sessionClient(t, st, base, bob.ID)
53 res, _ := bc.Get(base + "/admin/runner")
54 if res.StatusCode != http.StatusForbidden {
55 t.Fatalf("bob ziet /admin/runner: %d", res.StatusCode)
56 }
57 res.Body.Close()
58 res, _ = bc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {bcsrf}})
59 if res.StatusCode != http.StatusForbidden {
60 t.Fatalf("bob kan pauzeren: %d", res.StatusCode)
61 }
62 res.Body.Close()
63 bobTok := issue(t, st, bob.ID, "api")
64 for _, c := range []struct{ m, p string }{{"GET", "/admin/runner/status"}, {"GET", "/admin/runner/settings"}, {"PUT", "/admin/runner/settings"}, {"POST", "/admin/runner/pause"}, {"GET", "/admin/runner/jobs"}} {
65 if code, _ := rapi(t, base, bobTok, c.m, c.p, map[string]any{"concurrency": 3}); code != http.StatusForbidden {
66 t.Fatalf("bob %s %s: %d", c.m, c.p, code)
67 }
68 }
69 if code, _ := rapi(t, base, "", "GET", "/admin/runner/status", nil); code != http.StatusUnauthorized {
70 t.Fatalf("anoniem: %d", code)
71 }
72 if e.srv.Runner.Paused() {
73 t.Fatal("pauze door niet-beheerder")
74 }
75
76 // Beheerder: UI, CSRF verplicht, pauze, instellingen, API.
77 tc, tcsrf := sessionClient(t, st, base, tim.ID)
78 res, _ = tc.Get(base + "/admin/runner")
79 page := body(t, res)
80 if res.StatusCode != 200 || !strings.Contains(page, `class="rui"`) || !strings.Contains(page, "Image presets") || !strings.Contains(page, "bluegit/node") {
81 t.Fatalf("adminpagina %d: %.300s", res.StatusCode, page)
82 }
83 res, _ = tc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {"fout"}})
84 if res.StatusCode != http.StatusForbidden {
85 t.Fatalf("zonder csrf: %d", res.StatusCode)
86 }
87 res.Body.Close()
88 res, _ = tc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {tcsrf}})
89 if res.StatusCode != http.StatusSeeOther || !e.srv.Runner.Paused() {
90 t.Fatalf("pauze: %d %v", res.StatusCode, e.srv.Runner.Paused())
91 }
92 res.Body.Close()
93 form := url.Values{"csrf": {tcsrf}, "name": {"Steve 2"}, "concurrency": {"3"}, "max_images": {"7"}, "cpus": {"1.5"}, "memory_mb": {"2048"}, "pull_policy": {"always"}, "cleanup_work": {"on"}}
94 res, _ = tc.PostForm(base+"/admin/runner/settings", form)
95 if loc := res.Header.Get("Location"); !strings.Contains(loc, "ok=rui.ok.saved") {
96 t.Fatalf("opslaan: %s", loc)
97 }
98 res.Body.Close()
99 if e.srv.Runner.BuiltinName() != "Steve 2" {
100 t.Fatalf("naam niet live: %s", e.srv.Runner.BuiltinName())
101 }
102 res, _ = tc.PostForm(base+"/admin/runner/presets", url.Values{"csrf": {tcsrf}, "name": {"team/tools"}, "image": {"alpine:3.20"}})
103 res.Body.Close()
104 adminTok := issue(t, st, tim.ID, "runners")
105 code, b := rapi(t, base, adminTok, "GET", "/admin/runner/settings", nil)
106 var s runnercfg.Settings
107 _ = json.Unmarshal(b, &s)
108 if code != 200 || s.Concurrency != 3 || s.MaxImages != 7 || !s.Paused || len(s.Presets) != 1 || s.Presets[0].Name != "team/tools" {
109 t.Fatalf("api settings %d %s", code, b)
110 }
111 code, b = rapi(t, base, adminTok, "PUT", "/admin/runner/settings", map[string]any{"concurrency": 0})
112 if code != http.StatusUnprocessableEntity {
113 t.Fatalf("ongeldig: %d %s", code, b)
114 }
115 code, b = rapi(t, base, adminTok, "POST", "/admin/runner/resume", nil)
116 if code != 200 || e.srv.Runner.Paused() {
117 t.Fatalf("hervatten %d %s", code, b)
118 }
119 code, b = rapi(t, base, adminTok, "GET", "/admin/runner/status", nil)
120 if code != 200 || !strings.Contains(string(b), `"safe_to_upgrade":true`) || !strings.Contains(string(b), `"kind":"builtin"`) {
121 t.Fatalf("status %d %s", code, b)
122 }
123 }
124
125 // Een gepauzeerde ingebouwde runner start geen jobs; na hervatten wel.
126 // Queued jobs tellen niet als running, dus een self-update wacht er niet op.
127 func TestBuiltinPauseDrain(t *testing.T) {
128 e := newCIEnv(t)
129 ctx := context.Background()
130 if err := e.srv.ApplyRunnerSettings(); err != nil {
131 t.Fatal(err)
132 }
133 e.rn.Jobs.SetPaused(true)
134 pid := e.pipeline()
135 for i := 0; i < 3; i++ {
136 e.rn.Tick(ctx)
137 }
138 jobs, _ := e.st.JobsByPipeline(ctx, pid)
139 for _, j := range jobs {
140 if j.Status == "running" || j.Status == "success" {
141 t.Fatalf("job %s liep tijdens pauze: %s", j.Name, j.Status)
142 }
143 }
144 if n, _ := e.st.CountRunningJobs(ctx); n != 0 {
145 t.Fatalf("running %d tijdens pauze", n)
146 }
147 e.rn.Jobs.SetPaused(false)
148 p := e.wait(pid, 30*time.Second)
149 if p.Status != "success" {
150 t.Fatalf("na hervatten: %s", p.Status)
151 }
152 if got := e.rn.Jobs.Recent(); len(got) != 2 {
153 t.Fatalf("recente jobs: %d", len(got))
154 }
155 }
156
157 func TestHelpPages(t *testing.T) {
158 e := newCIEnv(t)
159 for _, p := range []string{"/help", "/help/runners", "/help/agents", "/help/ci"} {
160 res, err := http.Get(e.ts.URL + p)
161 if err != nil {
162 t.Fatal(err)
163 }
164 page := body(t, res)
165 if res.StatusCode != 200 || !strings.Contains(page, `class="foot"`) {
166 t.Fatalf("%s: %d", p, res.StatusCode)
167 }
168 if p == "/help/runners" && (!strings.Contains(page, "443") || !strings.Contains(page, `href="/help/agents`)) {
169 t.Fatalf("runnerdocs onvolledig of link niet omgezet")
170 }
171 }
172 if res, _ := http.Get(e.ts.URL + "/help/bestaat-niet"); res.StatusCode != 404 {
173 t.Fatalf("onbekende help: %d", res.StatusCode)
174 }
175 }
176
177 // Heartbeat: lokale pauze (draining) en naam gaan naar de server; een
178 // runner die draint krijgt geen jobs in de volgorde.
179 func TestHeartbeatDrainingAndName(t *testing.T) {
180 e := newCIEnv(t)
181 ctx := context.Background()
182 tok, _ := e.st.CreateRunnerRegToken(ctx, "user", e.user.ID, e.user.ID)
183 rn, plain, err := e.st.RegisterRunner(ctx, tok, "old-name", "test")
184 if err != nil {
185 t.Fatal(err)
186 }
187 req, _ := http.NewRequest("POST", e.ts.URL+"/api/v1/runner/heartbeat", strings.NewReader(`{"draining":true,"name":"nieuwe-naam"}`))
188 req.Header.Set("Authorization", "Bearer "+plain)
189 res, err := http.DefaultClient.Do(req)
190 if err != nil {
191 t.Fatal(err)
192 }
193 b := body(t, res)
194 if res.StatusCode != 200 || !strings.Contains(b, "nieuwe-naam") {
195 t.Fatalf("heartbeat %d %s", res.StatusCode, b)
196 }
197 got, _ := e.st.RunnerByID(ctx, rn.ID)
198 if !got.Draining || got.Name != "nieuwe-naam" {
199 t.Fatalf("niet opgeslagen: %+v", got)
200 }
201 tim := issue(t, e.st, e.user.ID, "runners")
202 code, lb := rapi(t, e.ts.URL, tim, "GET", "/user/runners", nil)
203 if code != 200 || !strings.Contains(string(lb), `"status":"draining"`) {
204 t.Fatalf("lijst %d %s", code, lb)
205 }
206 }
@@ -0,0 +1,206 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "io"
7 "net/http"
8 "net/http/cookiejar"
9 "net/url"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/runnercfg"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func sessionClient(t *testing.T, st *store.Store, base string, uid int64) (*http.Client, string) {
19 t.Helper()
20 sess, err := st.CreateSession(context.Background(), uid, "dev", time.Now().Add(time.Hour))
21 if err != nil {
22 t.Fatal(err)
23 }
24 jar, _ := cookiejar.New(nil)
25 u, _ := url.Parse(base)
26 jar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
27 c := &http.Client{Jar: jar, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
28 return c, sess.CSRF
29}
30
31func body(t *testing.T, res *http.Response) string {
32 t.Helper()
33 defer res.Body.Close()
34 b, _ := io.ReadAll(res.Body)
35 return string(b)
36}
37
38func TestAdminRunnerOnlyForInstanceAdmin(t *testing.T) {
39 e := newCIEnv(t)
40 ctx := context.Background()
41 st, base := e.st, e.ts.URL
42 tim, _ := st.UserByID(ctx, e.user.ID)
43 if !tim.InstanceAdmin {
44 t.Skip("eerste gebruiker is geen beheerder in deze opzet")
45 }
46 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
47 if err := e.srv.ApplyRunnerSettings(); err != nil {
48 t.Fatal(err)
49 }
50
51 // Niet-beheerder: UI 403, API 403, ook met scope api.
52 bc, bcsrf := sessionClient(t, st, base, bob.ID)
53 res, _ := bc.Get(base + "/admin/runner")
54 if res.StatusCode != http.StatusForbidden {
55 t.Fatalf("bob ziet /admin/runner: %d", res.StatusCode)
56 }
57 res.Body.Close()
58 res, _ = bc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {bcsrf}})
59 if res.StatusCode != http.StatusForbidden {
60 t.Fatalf("bob kan pauzeren: %d", res.StatusCode)
61 }
62 res.Body.Close()
63 bobTok := issue(t, st, bob.ID, "api")
64 for _, c := range []struct{ m, p string }{{"GET", "/admin/runner/status"}, {"GET", "/admin/runner/settings"}, {"PUT", "/admin/runner/settings"}, {"POST", "/admin/runner/pause"}, {"GET", "/admin/runner/jobs"}} {
65 if code, _ := rapi(t, base, bobTok, c.m, c.p, map[string]any{"concurrency": 3}); code != http.StatusForbidden {
66 t.Fatalf("bob %s %s: %d", c.m, c.p, code)
67 }
68 }
69 if code, _ := rapi(t, base, "", "GET", "/admin/runner/status", nil); code != http.StatusUnauthorized {
70 t.Fatalf("anoniem: %d", code)
71 }
72 if e.srv.Runner.Paused() {
73 t.Fatal("pauze door niet-beheerder")
74 }
75
76 // Beheerder: UI, CSRF verplicht, pauze, instellingen, API.
77 tc, tcsrf := sessionClient(t, st, base, tim.ID)
78 res, _ = tc.Get(base + "/admin/runner")
79 page := body(t, res)
80 if res.StatusCode != 200 || !strings.Contains(page, `class="rui"`) || !strings.Contains(page, "Image presets") || !strings.Contains(page, "bluegit/node") {
81 t.Fatalf("adminpagina %d: %.300s", res.StatusCode, page)
82 }
83 res, _ = tc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {"fout"}})
84 if res.StatusCode != http.StatusForbidden {
85 t.Fatalf("zonder csrf: %d", res.StatusCode)
86 }
87 res.Body.Close()
88 res, _ = tc.PostForm(base+"/admin/runner/pause", url.Values{"csrf": {tcsrf}})
89 if res.StatusCode != http.StatusSeeOther || !e.srv.Runner.Paused() {
90 t.Fatalf("pauze: %d %v", res.StatusCode, e.srv.Runner.Paused())
91 }
92 res.Body.Close()
93 form := url.Values{"csrf": {tcsrf}, "name": {"Steve 2"}, "concurrency": {"3"}, "max_images": {"7"}, "cpus": {"1.5"}, "memory_mb": {"2048"}, "pull_policy": {"always"}, "cleanup_work": {"on"}}
94 res, _ = tc.PostForm(base+"/admin/runner/settings", form)
95 if loc := res.Header.Get("Location"); !strings.Contains(loc, "ok=rui.ok.saved") {
96 t.Fatalf("opslaan: %s", loc)
97 }
98 res.Body.Close()
99 if e.srv.Runner.BuiltinName() != "Steve 2" {
100 t.Fatalf("naam niet live: %s", e.srv.Runner.BuiltinName())
101 }
102 res, _ = tc.PostForm(base+"/admin/runner/presets", url.Values{"csrf": {tcsrf}, "name": {"team/tools"}, "image": {"alpine:3.20"}})
103 res.Body.Close()
104 adminTok := issue(t, st, tim.ID, "runners")
105 code, b := rapi(t, base, adminTok, "GET", "/admin/runner/settings", nil)
106 var s runnercfg.Settings
107 _ = json.Unmarshal(b, &s)
108 if code != 200 || s.Concurrency != 3 || s.MaxImages != 7 || !s.Paused || len(s.Presets) != 1 || s.Presets[0].Name != "team/tools" {
109 t.Fatalf("api settings %d %s", code, b)
110 }
111 code, b = rapi(t, base, adminTok, "PUT", "/admin/runner/settings", map[string]any{"concurrency": 0})
112 if code != http.StatusUnprocessableEntity {
113 t.Fatalf("ongeldig: %d %s", code, b)
114 }
115 code, b = rapi(t, base, adminTok, "POST", "/admin/runner/resume", nil)
116 if code != 200 || e.srv.Runner.Paused() {
117 t.Fatalf("hervatten %d %s", code, b)
118 }
119 code, b = rapi(t, base, adminTok, "GET", "/admin/runner/status", nil)
120 if code != 200 || !strings.Contains(string(b), `"safe_to_upgrade":true`) || !strings.Contains(string(b), `"kind":"builtin"`) {
121 t.Fatalf("status %d %s", code, b)
122 }
123}
124
125// Een gepauzeerde ingebouwde runner start geen jobs; na hervatten wel.
126// Queued jobs tellen niet als running, dus een self-update wacht er niet op.
127func TestBuiltinPauseDrain(t *testing.T) {
128 e := newCIEnv(t)
129 ctx := context.Background()
130 if err := e.srv.ApplyRunnerSettings(); err != nil {
131 t.Fatal(err)
132 }
133 e.rn.Jobs.SetPaused(true)
134 pid := e.pipeline()
135 for i := 0; i < 3; i++ {
136 e.rn.Tick(ctx)
137 }
138 jobs, _ := e.st.JobsByPipeline(ctx, pid)
139 for _, j := range jobs {
140 if j.Status == "running" || j.Status == "success" {
141 t.Fatalf("job %s liep tijdens pauze: %s", j.Name, j.Status)
142 }
143 }
144 if n, _ := e.st.CountRunningJobs(ctx); n != 0 {
145 t.Fatalf("running %d tijdens pauze", n)
146 }
147 e.rn.Jobs.SetPaused(false)
148 p := e.wait(pid, 30*time.Second)
149 if p.Status != "success" {
150 t.Fatalf("na hervatten: %s", p.Status)
151 }
152 if got := e.rn.Jobs.Recent(); len(got) != 2 {
153 t.Fatalf("recente jobs: %d", len(got))
154 }
155}
156
157func TestHelpPages(t *testing.T) {
158 e := newCIEnv(t)
159 for _, p := range []string{"/help", "/help/runners", "/help/agents", "/help/ci"} {
160 res, err := http.Get(e.ts.URL + p)
161 if err != nil {
162 t.Fatal(err)
163 }
164 page := body(t, res)
165 if res.StatusCode != 200 || !strings.Contains(page, `class="foot"`) {
166 t.Fatalf("%s: %d", p, res.StatusCode)
167 }
168 if p == "/help/runners" && (!strings.Contains(page, "443") || !strings.Contains(page, `href="/help/agents`)) {
169 t.Fatalf("runnerdocs onvolledig of link niet omgezet")
170 }
171 }
172 if res, _ := http.Get(e.ts.URL + "/help/bestaat-niet"); res.StatusCode != 404 {
173 t.Fatalf("onbekende help: %d", res.StatusCode)
174 }
175}
176
177// Heartbeat: lokale pauze (draining) en naam gaan naar de server; een
178// runner die draint krijgt geen jobs in de volgorde.
179func TestHeartbeatDrainingAndName(t *testing.T) {
180 e := newCIEnv(t)
181 ctx := context.Background()
182 tok, _ := e.st.CreateRunnerRegToken(ctx, "user", e.user.ID, e.user.ID)
183 rn, plain, err := e.st.RegisterRunner(ctx, tok, "old-name", "test")
184 if err != nil {
185 t.Fatal(err)
186 }
187 req, _ := http.NewRequest("POST", e.ts.URL+"/api/v1/runner/heartbeat", strings.NewReader(`{"draining":true,"name":"nieuwe-naam"}`))
188 req.Header.Set("Authorization", "Bearer "+plain)
189 res, err := http.DefaultClient.Do(req)
190 if err != nil {
191 t.Fatal(err)
192 }
193 b := body(t, res)
194 if res.StatusCode != 200 || !strings.Contains(b, "nieuwe-naam") {
195 t.Fatalf("heartbeat %d %s", res.StatusCode, b)
196 }
197 got, _ := e.st.RunnerByID(ctx, rn.ID)
198 if !got.Draining || got.Name != "nieuwe-naam" {
199 t.Fatalf("niet opgeslagen: %+v", got)
200 }
201 tim := issue(t, e.st, e.user.ID, "runners")
202 code, lb := rapi(t, e.ts.URL, tim, "GET", "/user/runners", nil)
203 if code != 200 || !strings.Contains(string(lb), `"status":"draining"`) {
204 t.Fatalf("lijst %d %s", code, lb)
205 }
206}
internal/server/api_routes.go +6 −0
@@ -7,6 +7,12 @@ import (
7 7 )
8 8
9 9 var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
11 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
12 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
13 {http.MethodGet, "/api/v1/admin/runner/jobs", access.ScopeRunnerRead, authUser, "Active and recent jobs of the built-in runner (instance admin)", (*Server).apiAdminRunnerJobs},
14 {http.MethodPost, "/api/v1/admin/runner/pause", access.ScopeRunnerWrite, authUser, "Pause (drain) the built-in runner (instance admin)", (*Server).apiAdminRunnerPause},
15 {http.MethodPost, "/api/v1/admin/runner/resume", access.ScopeRunnerWrite, authUser, "Resume the built-in runner (instance admin)", (*Server).apiAdminRunnerResume},
10 16 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
11 17 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
12 18 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
@@ -7,6 +7,12 @@ import (
7)
7)
8
8
9var apiCatalog = []apiRoute{
9var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
11 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
12 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
13 {http.MethodGet, "/api/v1/admin/runner/jobs", access.ScopeRunnerRead, authUser, "Active and recent jobs of the built-in runner (instance admin)", (*Server).apiAdminRunnerJobs},
14 {http.MethodPost, "/api/v1/admin/runner/pause", access.ScopeRunnerWrite, authUser, "Pause (drain) the built-in runner (instance admin)", (*Server).apiAdminRunnerPause},
15 {http.MethodPost, "/api/v1/admin/runner/resume", access.ScopeRunnerWrite, authUser, "Resume the built-in runner (instance admin)", (*Server).apiAdminRunnerResume},
10 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
16 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
11 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
17 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
12 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
18 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
internal/server/help.go added +151 −0
@@ -0,0 +1,151 @@
1 package server
2
3 import (
4 "html/template"
5 "io/fs"
6 "net/http"
7 "regexp"
8 "strings"
9
10 "gitlab.com/Timfa/bluegit/docs"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/markdown"
13 )
14
15 // helpDocs is de volgorde in /help. Een vertaling heet <naam>.<taal>.md
16 // (bv. runner.en.md); het origineel is Nederlands.
17 var helpDocs = []struct{ Slug, File string }{
18 {"runners", "runner"},
19 {"agents", "agents"},
20 {"ci", "CI"},
21 {"beheer", "BEHEER"},
22 {"ingress", "INGRESS"},
23 {"auth", "AUTH"},
24 {"aur", "AUR"},
25 {"migratie", "MIGRATIE"},
26 {"architecture", "ARCHITECTURE"},
27 }
28
29 // HelpDoc is één pagina in de lijst of op het scherm.
30 type HelpDoc struct {
31 Slug string
32 Title string
33 Summary string
34 HTML template.HTML
35 Fallback bool // niet beschikbaar in de gekozen taal
36 On bool
37 }
38
39 var mdLink = regexp.MustCompile(`\[([^\]]+)\]\([^)]*\)`)
40
41 var helpLink = regexp.MustCompile(`href="/help/([A-Za-z0-9_-]+)\.md(#[^"]*)?"`)
42
43 // helpSource: eerst de gekozen taal, dan Engels (behalve voor NL), dan het origineel.
44 func helpSource(file string, lang i18n.Lang) (string, bool) {
45 var try []string
46 if lang != i18n.NL {
47 try = append(try, file+"."+string(lang)+".md")
48 if lang != i18n.EN {
49 try = append(try, file+".en.md")
50 }
51 }
52 try = append(try, file+".md")
53 for i, name := range try {
54 b, err := fs.ReadFile(docs.FS, name)
55 if err != nil {
56 continue
57 }
58 exact := (i == 0 && lang != i18n.NL) || (lang == i18n.NL)
59 return string(b), !exact
60 }
61 return "", false
62 }
63
64 func helpSlugFor(file string) string {
65 for _, d := range helpDocs {
66 if strings.EqualFold(d.File, file) {
67 return d.Slug
68 }
69 }
70 return strings.ToLower(file)
71 }
72
73 func helpMeta(src string) (title, summary string) {
74 var para []string
75 for _, line := range strings.Split(src, "\n") {
76 t := strings.TrimSpace(line)
77 if title == "" {
78 if strings.HasPrefix(t, "# ") {
79 title = strings.TrimSpace(t[2:])
80 }
81 continue
82 }
83 if t == "" || strings.HasPrefix(t, "#") || strings.HasPrefix(t, "```") || strings.HasPrefix(t, "|") {
84 if len(para) > 0 {
85 break
86 }
87 continue
88 }
89 para = append(para, t)
90 }
91 summary = mdLink.ReplaceAllString(strings.Join(para, " "), "$1")
92 summary = strings.ReplaceAll(strings.ReplaceAll(summary, "`", ""), "**", "")
93 if r := []rune(summary); len(r) > 160 {
94 summary = string(r[:157]) + "…"
95 }
96 return
97 }
98
99 // renderHelp maakt HTML en zet links naar andere docs om naar /help/<slug>.
100 func renderHelp(src string) template.HTML {
101 out := markdown.Render(src, "/help/", "", "")
102 out = helpLink.ReplaceAllStringFunc(out, func(m string) string {
103 sub := helpLink.FindStringSubmatch(m)
104 return `href="/help/` + helpSlugFor(sub[1]) + sub[2] + `"`
105 })
106 return template.HTML(out)
107 }
108
109 func helpList(lang i18n.Lang, current string) []HelpDoc {
110 var out []HelpDoc
111 for _, d := range helpDocs {
112 src, fb := helpSource(d.File, lang)
113 if src == "" {
114 continue
115 }
116 t, sum := helpMeta(src)
117 out = append(out, HelpDoc{Slug: d.Slug, Title: t, Summary: sum, Fallback: fb, On: d.Slug == current})
118 }
119 return out
120 }
121
122 func (s *Server) helpIndex(w http.ResponseWriter, r *http.Request) {
123 v := s.view(w, r, "title.help")
124 v.Page = "help"
125 v.Help = true
126 v.HelpDocs = helpList(s.langOf(r), "")
127 s.render(w, "help", v)
128 }
129
130 func (s *Server) helpPage(w http.ResponseWriter, r *http.Request) {
131 lang := s.langOf(r)
132 slug := strings.ToLower(r.PathValue("doc"))
133 for _, d := range helpDocs {
134 if d.Slug != slug {
135 continue
136 }
137 src, fb := helpSource(d.File, lang)
138 if src == "" {
139 break
140 }
141 t, _ := helpMeta(src)
142 v := s.view(w, r, t)
143 v.Page = "help"
144 v.Help = true
145 v.HelpDocs = helpList(lang, slug)
146 v.HelpDoc = &HelpDoc{Slug: slug, Title: t, HTML: renderHelp(src), Fallback: fb}
147 s.render(w, "help", v)
148 return
149 }
150 http.NotFound(w, r)
151 }
@@ -0,0 +1,151 @@
1package server
2
3import (
4 "html/template"
5 "io/fs"
6 "net/http"
7 "regexp"
8 "strings"
9
10 "gitlab.com/Timfa/bluegit/docs"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/markdown"
13)
14
15// helpDocs is de volgorde in /help. Een vertaling heet <naam>.<taal>.md
16// (bv. runner.en.md); het origineel is Nederlands.
17var helpDocs = []struct{ Slug, File string }{
18 {"runners", "runner"},
19 {"agents", "agents"},
20 {"ci", "CI"},
21 {"beheer", "BEHEER"},
22 {"ingress", "INGRESS"},
23 {"auth", "AUTH"},
24 {"aur", "AUR"},
25 {"migratie", "MIGRATIE"},
26 {"architecture", "ARCHITECTURE"},
27}
28
29// HelpDoc is één pagina in de lijst of op het scherm.
30type HelpDoc struct {
31 Slug string
32 Title string
33 Summary string
34 HTML template.HTML
35 Fallback bool // niet beschikbaar in de gekozen taal
36 On bool
37}
38
39var mdLink = regexp.MustCompile(`\[([^\]]+)\]\([^)]*\)`)
40
41var helpLink = regexp.MustCompile(`href="/help/([A-Za-z0-9_-]+)\.md(#[^"]*)?"`)
42
43// helpSource: eerst de gekozen taal, dan Engels (behalve voor NL), dan het origineel.
44func helpSource(file string, lang i18n.Lang) (string, bool) {
45 var try []string
46 if lang != i18n.NL {
47 try = append(try, file+"."+string(lang)+".md")
48 if lang != i18n.EN {
49 try = append(try, file+".en.md")
50 }
51 }
52 try = append(try, file+".md")
53 for i, name := range try {
54 b, err := fs.ReadFile(docs.FS, name)
55 if err != nil {
56 continue
57 }
58 exact := (i == 0 && lang != i18n.NL) || (lang == i18n.NL)
59 return string(b), !exact
60 }
61 return "", false
62}
63
64func helpSlugFor(file string) string {
65 for _, d := range helpDocs {
66 if strings.EqualFold(d.File, file) {
67 return d.Slug
68 }
69 }
70 return strings.ToLower(file)
71}
72
73func helpMeta(src string) (title, summary string) {
74 var para []string
75 for _, line := range strings.Split(src, "\n") {
76 t := strings.TrimSpace(line)
77 if title == "" {
78 if strings.HasPrefix(t, "# ") {
79 title = strings.TrimSpace(t[2:])
80 }
81 continue
82 }
83 if t == "" || strings.HasPrefix(t, "#") || strings.HasPrefix(t, "```") || strings.HasPrefix(t, "|") {
84 if len(para) > 0 {
85 break
86 }
87 continue
88 }
89 para = append(para, t)
90 }
91 summary = mdLink.ReplaceAllString(strings.Join(para, " "), "$1")
92 summary = strings.ReplaceAll(strings.ReplaceAll(summary, "`", ""), "**", "")
93 if r := []rune(summary); len(r) > 160 {
94 summary = string(r[:157]) + "…"
95 }
96 return
97}
98
99// renderHelp maakt HTML en zet links naar andere docs om naar /help/<slug>.
100func renderHelp(src string) template.HTML {
101 out := markdown.Render(src, "/help/", "", "")
102 out = helpLink.ReplaceAllStringFunc(out, func(m string) string {
103 sub := helpLink.FindStringSubmatch(m)
104 return `href="/help/` + helpSlugFor(sub[1]) + sub[2] + `"`
105 })
106 return template.HTML(out)
107}
108
109func helpList(lang i18n.Lang, current string) []HelpDoc {
110 var out []HelpDoc
111 for _, d := range helpDocs {
112 src, fb := helpSource(d.File, lang)
113 if src == "" {
114 continue
115 }
116 t, sum := helpMeta(src)
117 out = append(out, HelpDoc{Slug: d.Slug, Title: t, Summary: sum, Fallback: fb, On: d.Slug == current})
118 }
119 return out
120}
121
122func (s *Server) helpIndex(w http.ResponseWriter, r *http.Request) {
123 v := s.view(w, r, "title.help")
124 v.Page = "help"
125 v.Help = true
126 v.HelpDocs = helpList(s.langOf(r), "")
127 s.render(w, "help", v)
128}
129
130func (s *Server) helpPage(w http.ResponseWriter, r *http.Request) {
131 lang := s.langOf(r)
132 slug := strings.ToLower(r.PathValue("doc"))
133 for _, d := range helpDocs {
134 if d.Slug != slug {
135 continue
136 }
137 src, fb := helpSource(d.File, lang)
138 if src == "" {
139 break
140 }
141 t, _ := helpMeta(src)
142 v := s.view(w, r, t)
143 v.Page = "help"
144 v.Help = true
145 v.HelpDocs = helpList(lang, slug)
146 v.HelpDoc = &HelpDoc{Slug: slug, Title: t, HTML: renderHelp(src), Fallback: fb}
147 s.render(w, "help", v)
148 return
149 }
150 http.NotFound(w, r)
151}
internal/server/runners.go +18 −2
@@ -24,13 +24,14 @@ type RunnerView struct {
24 24 Created time.Time
25 25 Version string
26 26 Paused bool
27 Draining bool
27 28 }
28 29
29 30 func runnerViews(rs []store.Runner) []RunnerView {
30 31 now := time.Now()
31 32 out := make([]RunnerView, 0, len(rs))
32 33 for _, r := range rs {
33 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused})
34 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused, Draining: r.Draining})
34 35 }
35 36 return out
36 37 }
@@ -241,7 +242,22 @@ func (s *Server) runnerHeartbeat(w http.ResponseWriter, r *http.Request) {
241 242 if !ok {
242 243 return
243 244 }
244 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name})
245 // Optioneel: {"draining": true} als de runner lokaal gepauzeerd is.
246 // {"name": "..."} als de naam op de runner zelf is ingesteld (die wint).
247 var body struct {
248 Draining *bool `json:"draining"`
249 Name string `json:"name"`
250 }
251 _ = json.NewDecoder(io.LimitReader(r.Body, 4096)).Decode(&body)
252 if body.Draining != nil && *body.Draining != rn.Draining {
253 _ = s.Store.SetRunnerDraining(r.Context(), rn.ID, *body.Draining)
254 }
255 if n := strings.TrimSpace(body.Name); n != "" && n != rn.Name && len(n) <= 63 {
256 if upd, err := s.Store.UpdateRunner(r.Context(), rn.OwnerKind, rn.OwnerID, rn.ID, &n, nil); err == nil {
257 rn = upd
258 }
259 }
260 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name, "paused": rn.Paused})
245 261 }
246 262
247 263 func (s *Server) runnerRequest(w http.ResponseWriter, r *http.Request) {
@@ -24,13 +24,14 @@ type RunnerView struct {
24 Created time.Time
24 Created time.Time
25 Version string
25 Version string
26 Paused bool
26 Paused bool
27 Draining bool
27}
28}
28
29
29func runnerViews(rs []store.Runner) []RunnerView {
30func runnerViews(rs []store.Runner) []RunnerView {
30 now := time.Now()
31 now := time.Now()
31 out := make([]RunnerView, 0, len(rs))
32 out := make([]RunnerView, 0, len(rs))
32 for _, r := range rs {
33 for _, r := range rs {
33 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused})
34 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused, Draining: r.Draining})
34 }
35 }
35 return out
36 return out
36}
37}
@@ -241,7 +242,22 @@ func (s *Server) runnerHeartbeat(w http.ResponseWriter, r *http.Request) {
241 if !ok {
242 if !ok {
242 return
243 return
243 }
244 }
244 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name})
245 // Optioneel: {"draining": true} als de runner lokaal gepauzeerd is.
246 // {"name": "..."} als de naam op de runner zelf is ingesteld (die wint).
247 var body struct {
248 Draining *bool `json:"draining"`
249 Name string `json:"name"`
250 }
251 _ = json.NewDecoder(io.LimitReader(r.Body, 4096)).Decode(&body)
252 if body.Draining != nil && *body.Draining != rn.Draining {
253 _ = s.Store.SetRunnerDraining(r.Context(), rn.ID, *body.Draining)
254 }
255 if n := strings.TrimSpace(body.Name); n != "" && n != rn.Name && len(n) <= 63 {
256 if upd, err := s.Store.UpdateRunner(r.Context(), rn.OwnerKind, rn.OwnerID, rn.ID, &n, nil); err == nil {
257 rn = upd
258 }
259 }
260 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name, "paused": rn.Paused})
245}
261}
246
262
247func (s *Server) runnerRequest(w http.ResponseWriter, r *http.Request) {
263func (s *Server) runnerRequest(w http.ResponseWriter, r *http.Request) {
internal/server/runners_api.go +3 −1
@@ -19,12 +19,14 @@ func runnerJSON(r store.Runner) map[string]any {
19 19 status := "offline"
20 20 if r.Paused {
21 21 status = "paused"
22 } else if r.Draining && r.Online(time.Now()) {
23 status = "draining"
22 24 } else if r.Online(time.Now()) {
23 25 status = "online"
24 26 }
25 27 return map[string]any{
26 28 "id": r.ID, "name": r.Name, "owner_kind": r.OwnerKind, "owner_id": r.OwnerID,
27 "status": status, "online": r.Online(time.Now()), "paused": r.Paused,
29 "status": status, "online": r.Online(time.Now()), "paused": r.Paused, "draining": r.Draining,
28 30 "last_seen": rfcTime(r.LastSeen), "created_at": rfcTime(r.CreatedAt), "version": r.Version,
29 31 }
30 32 }
@@ -19,12 +19,14 @@ func runnerJSON(r store.Runner) map[string]any {
19 status := "offline"
19 status := "offline"
20 if r.Paused {
20 if r.Paused {
21 status = "paused"
21 status = "paused"
22 } else if r.Draining && r.Online(time.Now()) {
23 status = "draining"
22 } else if r.Online(time.Now()) {
24 } else if r.Online(time.Now()) {
23 status = "online"
25 status = "online"
24 }
26 }
25 return map[string]any{
27 return map[string]any{
26 "id": r.ID, "name": r.Name, "owner_kind": r.OwnerKind, "owner_id": r.OwnerID,
28 "id": r.ID, "name": r.Name, "owner_kind": r.OwnerKind, "owner_id": r.OwnerID,
27 "status": status, "online": r.Online(time.Now()), "paused": r.Paused,
29 "status": status, "online": r.Online(time.Now()), "paused": r.Paused, "draining": r.Draining,
28 "last_seen": rfcTime(r.LastSeen), "created_at": rfcTime(r.CreatedAt), "version": r.Version,
30 "last_seen": rfcTime(r.LastSeen), "created_at": rfcTime(r.CreatedAt), "version": r.Version,
29 }
31 }
30}
32}
internal/server/server.go +8 −1
@@ -30,7 +30,7 @@ import (
30 30 "gitlab.com/Timfa/bluegit/internal/store"
31 31 )
32 32
33 //go:embed templates/*.html static/*
33 //go:embed templates/*.html static/*.css static/*.js static/*.svg static/*.ttf static/*.txt
34 34 var webFS embed.FS
35 35
36 36 // Server bedient BlueGit.
@@ -85,6 +85,9 @@ func (s *Server) Handler() http.Handler {
85 85 mux := http.NewServeMux()
86 86 mux.HandleFunc("GET /assets/{file}", s.asset)
87 87 mux.HandleFunc("GET /-/info", s.infoPage)
88 mux.HandleFunc("GET /help", s.helpIndex)
89 mux.HandleFunc("GET /help/{doc}", s.helpPage)
90 s.mountRunnerAdmin(mux)
88 91 mux.HandleFunc("GET /-/card.png", s.cardPNG)
89 92 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
90 93 s.mountAPI(mux)
@@ -627,6 +630,10 @@ type View struct {
627 630 MinFree string
628 631 Wide bool
629 632 Info bool
633 Help bool
634 HelpDocs []HelpDoc
635 HelpDoc *HelpDoc
636 RunnerUI template.HTML
630 637 ShowUpdate bool
631 638 Update *UpdateView
632 639 HookDoc string
@@ -30,7 +30,7 @@ import (
30 "gitlab.com/Timfa/bluegit/internal/store"
30 "gitlab.com/Timfa/bluegit/internal/store"
31)
31)
32
32
33//go:embed templates/*.html static/*
33//go:embed templates/*.html static/*.css static/*.js static/*.svg static/*.ttf static/*.txt
34var webFS embed.FS
34var webFS embed.FS
35
35
36// Server bedient BlueGit.
36// Server bedient BlueGit.
@@ -85,6 +85,9 @@ func (s *Server) Handler() http.Handler {
85 mux := http.NewServeMux()
85 mux := http.NewServeMux()
86 mux.HandleFunc("GET /assets/{file}", s.asset)
86 mux.HandleFunc("GET /assets/{file}", s.asset)
87 mux.HandleFunc("GET /-/info", s.infoPage)
87 mux.HandleFunc("GET /-/info", s.infoPage)
88 mux.HandleFunc("GET /help", s.helpIndex)
89 mux.HandleFunc("GET /help/{doc}", s.helpPage)
90 s.mountRunnerAdmin(mux)
88 mux.HandleFunc("GET /-/card.png", s.cardPNG)
91 mux.HandleFunc("GET /-/card.png", s.cardPNG)
89 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
92 mux.HandleFunc("GET /api/v1/oembed", s.oembed)
90 s.mountAPI(mux)
93 s.mountAPI(mux)
@@ -627,6 +630,10 @@ type View struct {
627 MinFree string
630 MinFree string
628 Wide bool
631 Wide bool
629 Info bool
632 Info bool
633 Help bool
634 HelpDocs []HelpDoc
635 HelpDoc *HelpDoc
636 RunnerUI template.HTML
630 ShowUpdate bool
637 ShowUpdate bool
631 Update *UpdateView
638 Update *UpdateView
632 HookDoc string
639 HookDoc string
internal/server/static/static.go added +15 −0
@@ -0,0 +1,15 @@
1 // Package static deelt de BlueGit-stylesheet en het logo met andere
2 // binaries, zoals de webinterface van bluegit-runner.
3 package static
4
5 import _ "embed"
6
7 // StyleCSS is de stylesheet van BlueGit.
8 //
9 //go:embed style.css
10 var StyleCSS []byte
11
12 // LogoSVG is het BlueGit-logo.
13 //
14 //go:embed logo.svg
15 var LogoSVG []byte
@@ -0,0 +1,15 @@
1// Package static deelt de BlueGit-stylesheet en het logo met andere
2// binaries, zoals de webinterface van bluegit-runner.
3package static
4
5import _ "embed"
6
7// StyleCSS is de stylesheet van BlueGit.
8//
9//go:embed style.css
10var StyleCSS []byte
11
12// LogoSVG is het BlueGit-logo.
13//
14//go:embed logo.svg
15var LogoSVG []byte
internal/server/static/style.css +81 −0
@@ -1329,3 +1329,84 @@ table.md { display: block; max-width: 100%; overflow-x: auto; }
1329 1329 .headpipe .stages { flex-wrap: wrap; min-width: 0; }
1330 1330 .commitbar .btn.ghost { margin-left: auto; }
1331 1331 }
1332
1333 /* Help (/help) en footer */
1334 .foot { display: flex; flex-wrap: wrap; gap: var(--sp-4); justify-content: center; padding: var(--sp-4); border-top: 1px solid var(--line); color: var(--muted); font-size: var(--fs-sm); background: var(--card); }
1335 .foot a { color: var(--muted); text-decoration: none; }
1336 .foot a:hover { color: var(--blue-deep); text-decoration: underline; }
1337 .helpgrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: var(--sp-3); margin-top: var(--sp-4); }
1338 .helpcard { overflow-wrap: anywhere; display: flex; flex-direction: column; gap: var(--sp-1); text-decoration: none; color: var(--ink); min-width: 0; }
1339 .helpcard:hover { border-color: var(--blue); box-shadow: var(--shadow); }
1340 .helpcard .pill { align-self: flex-start; }
1341 .helpdoc { margin-top: 0; }
1342 .helpdoc .mdbody { overflow-wrap: anywhere; }
1343 .helpdoc pre { max-width: 100%; overflow-x: auto; }
1344 .helpdoc table.md { display: block; overflow-x: auto; max-width: 100%; }
1345 .helplink { font-size: var(--fs-sm); }
1346
1347 /* Runnerbeheer (bluegit-runner UI en /admin/runner) */
1348 .rui { display: flex; flex-direction: column; gap: var(--sp-4); min-width: 0; }
1349 .rui > .panel, .rui-cards > .panel { margin: 0; }
1350 .rui-head { display: flex; justify-content: space-between; align-items: flex-start; gap: var(--sp-4); flex-wrap: wrap; }
1351 .rui-head h1 { margin-bottom: var(--sp-1); overflow-wrap: anywhere; }
1352 .rui-head p { margin: 0; max-width: 70ch; }
1353 .rui-badge { display: inline-flex; align-items: center; gap: 6px; padding: 4px 12px; border-radius: 999px; font-weight: 600; font-size: var(--fs-sm); border: 1px solid var(--line); background: var(--card); }
1354 .rui-badge::before { content: ""; width: 8px; height: 8px; border-radius: 50%; background: currentColor; }
1355 .rui-badge.ok { color: var(--ok); background: #e5f6ec; border-color: #b7e3c8; }
1356 .rui-badge.warn { color: #8a5a00; background: #fff4dc; border-color: #f1d79c; }
1357 .rui-badge.bad { color: var(--bad); background: #fde8e8; border-color: #f2c2c2; }
1358 .rui-cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: var(--sp-4); }
1359 .rui-card h2, .rui .panel h2 { margin-top: 0; }
1360 .rui-dl { display: grid; grid-template-columns: max-content 1fr; gap: var(--sp-1) var(--sp-3); margin: 0; }
1361 .rui-dl dt { color: var(--muted); }
1362 .rui-dl dd { margin: 0; min-width: 0; overflow-wrap: anywhere; }
1363 .rui-big { font-size: 28px; font-weight: 650; margin: 0; line-height: 1.2; }
1364 .rui-big .muted { font-size: var(--fs); font-weight: 400; }
1365 .rui-safe { font-weight: 600; margin: var(--sp-2) 0; }
1366 .rui-safe.ok { color: var(--ok); }
1367 .rui-safe.warn { color: #8a5a00; }
1368 .rui-small { font-size: var(--fs-sm); margin-bottom: 0; }
1369 .rui-upgrade form { margin: var(--sp-2) 0 0; }
1370 .rui-sechead { display: flex; justify-content: space-between; align-items: center; gap: var(--sp-3); flex-wrap: wrap; }
1371 .rui-sechead form { margin: 0; }
1372 .rui-form fieldset { border: 1px solid var(--line); border-radius: var(--radius-lg); padding: var(--sp-3) var(--sp-4); margin: 0 0 var(--sp-3); display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 0 var(--sp-4); min-width: 0; }
1373 .rui-form legend { font-weight: 600; padding: 0 var(--sp-1); color: var(--blue-deep); }
1374 .rui-form label { display: flex; flex-direction: column; gap: 4px; min-width: 0; }
1375 .rui-form label small { font-size: var(--fs-sm); line-height: 1.35; }
1376 .rui-form label.rui-check { flex-direction: row; align-items: center; gap: var(--sp-2); }
1377 .rui-form label.rui-wide { grid-column: 1 / -1; }
1378 .rui-form textarea { font-family: var(--mono); font-size: var(--fs-sm); }
1379 .rui-rec { color: var(--blue-deep); }
1380 .rui-rec::before { content: "★ "; }
1381 .rui-actions { display: flex; justify-content: flex-end; }
1382 .rui-table { width: 100%; min-width: 560px; border-collapse: collapse; background: var(--card); }
1383 .rui-table td.act { width: 1%; white-space: nowrap; text-align: right; }
1384 .rui-table form { margin: 0; }
1385 .rui-table td code { white-space: nowrap; }
1386 .rui-table th { text-align: left; font-size: var(--fs-sm); color: var(--muted); }
1387 .rui-table td, .rui-table th { padding: 6px 8px; border-bottom: 1px solid var(--line); vertical-align: top; }
1388 .rui-st { font-size: var(--fs-sm); font-weight: 600; border-radius: 999px; padding: 1px 8px; border: 1px solid var(--line); }
1389 .rui-st.success { color: var(--ok); background: #e5f6ec; }
1390 .rui-st.failed { color: var(--bad); background: #fde8e8; }
1391 .rui-st.canceled { color: var(--muted); }
1392 .pill.rui-own { background: var(--blue-soft); border-color: #bcd3fb; color: var(--blue-deep); }
1393 .rui-add { margin-top: var(--sp-3); }
1394 .rui-add summary { cursor: pointer; font-weight: 600; color: var(--blue-deep); margin-bottom: var(--sp-2); }
1395 .rui-foot p { margin: 0; overflow-wrap: anywhere; }
1396 .rui-foot code { font-size: var(--fs-sm); }
1397 .rui-doc h2 { margin-top: var(--sp-5); }
1398 .rui-doc pre { max-width: 100%; overflow-x: auto; }
1399 .rui-login { max-width: 420px; margin: var(--sp-6) auto; }
1400 .rui-login input { width: 100%; }
1401 .rui-langs { display: flex; gap: var(--sp-2); }
1402 .rui-langs a { opacity: .75; font-size: var(--fs-sm); }
1403 .rui-langs a.on { opacity: 1; font-weight: 600; text-decoration: underline; }
1404 @media (max-width: 720px) {
1405 .rui-head { flex-direction: column; }
1406 .rui-form fieldset { grid-template-columns: 1fr; padding: var(--sp-2) var(--sp-3); }
1407 .rui-big { font-size: 22px; }
1408 .top:has(.rui-nav) { height: auto; min-height: var(--top-h); flex-wrap: wrap; row-gap: 4px; padding-top: 6px; padding-bottom: 6px; }
1409 .top nav.rui-nav { gap: var(--sp-2); font-size: var(--fs-sm); flex-wrap: wrap; }
1410 .top .brand { font-size: 14px; white-space: nowrap; }
1411 .rui-sechead form, .rui-sechead button { width: 100%; }
1412 }
@@ -1329,3 +1329,84 @@ table.md { display: block; max-width: 100%; overflow-x: auto; }
1329 .headpipe .stages { flex-wrap: wrap; min-width: 0; }
1329 .headpipe .stages { flex-wrap: wrap; min-width: 0; }
1330 .commitbar .btn.ghost { margin-left: auto; }
1330 .commitbar .btn.ghost { margin-left: auto; }
1331}
1331}
1332
1333/* Help (/help) en footer */
1334.foot { display: flex; flex-wrap: wrap; gap: var(--sp-4); justify-content: center; padding: var(--sp-4); border-top: 1px solid var(--line); color: var(--muted); font-size: var(--fs-sm); background: var(--card); }
1335.foot a { color: var(--muted); text-decoration: none; }
1336.foot a:hover { color: var(--blue-deep); text-decoration: underline; }
1337.helpgrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: var(--sp-3); margin-top: var(--sp-4); }
1338.helpcard { overflow-wrap: anywhere; display: flex; flex-direction: column; gap: var(--sp-1); text-decoration: none; color: var(--ink); min-width: 0; }
1339.helpcard:hover { border-color: var(--blue); box-shadow: var(--shadow); }
1340.helpcard .pill { align-self: flex-start; }
1341.helpdoc { margin-top: 0; }
1342.helpdoc .mdbody { overflow-wrap: anywhere; }
1343.helpdoc pre { max-width: 100%; overflow-x: auto; }
1344.helpdoc table.md { display: block; overflow-x: auto; max-width: 100%; }
1345.helplink { font-size: var(--fs-sm); }
1346
1347/* Runnerbeheer (bluegit-runner UI en /admin/runner) */
1348.rui { display: flex; flex-direction: column; gap: var(--sp-4); min-width: 0; }
1349.rui > .panel, .rui-cards > .panel { margin: 0; }
1350.rui-head { display: flex; justify-content: space-between; align-items: flex-start; gap: var(--sp-4); flex-wrap: wrap; }
1351.rui-head h1 { margin-bottom: var(--sp-1); overflow-wrap: anywhere; }
1352.rui-head p { margin: 0; max-width: 70ch; }
1353.rui-badge { display: inline-flex; align-items: center; gap: 6px; padding: 4px 12px; border-radius: 999px; font-weight: 600; font-size: var(--fs-sm); border: 1px solid var(--line); background: var(--card); }
1354.rui-badge::before { content: ""; width: 8px; height: 8px; border-radius: 50%; background: currentColor; }
1355.rui-badge.ok { color: var(--ok); background: #e5f6ec; border-color: #b7e3c8; }
1356.rui-badge.warn { color: #8a5a00; background: #fff4dc; border-color: #f1d79c; }
1357.rui-badge.bad { color: var(--bad); background: #fde8e8; border-color: #f2c2c2; }
1358.rui-cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: var(--sp-4); }
1359.rui-card h2, .rui .panel h2 { margin-top: 0; }
1360.rui-dl { display: grid; grid-template-columns: max-content 1fr; gap: var(--sp-1) var(--sp-3); margin: 0; }
1361.rui-dl dt { color: var(--muted); }
1362.rui-dl dd { margin: 0; min-width: 0; overflow-wrap: anywhere; }
1363.rui-big { font-size: 28px; font-weight: 650; margin: 0; line-height: 1.2; }
1364.rui-big .muted { font-size: var(--fs); font-weight: 400; }
1365.rui-safe { font-weight: 600; margin: var(--sp-2) 0; }
1366.rui-safe.ok { color: var(--ok); }
1367.rui-safe.warn { color: #8a5a00; }
1368.rui-small { font-size: var(--fs-sm); margin-bottom: 0; }
1369.rui-upgrade form { margin: var(--sp-2) 0 0; }
1370.rui-sechead { display: flex; justify-content: space-between; align-items: center; gap: var(--sp-3); flex-wrap: wrap; }
1371.rui-sechead form { margin: 0; }
1372.rui-form fieldset { border: 1px solid var(--line); border-radius: var(--radius-lg); padding: var(--sp-3) var(--sp-4); margin: 0 0 var(--sp-3); display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 0 var(--sp-4); min-width: 0; }
1373.rui-form legend { font-weight: 600; padding: 0 var(--sp-1); color: var(--blue-deep); }
1374.rui-form label { display: flex; flex-direction: column; gap: 4px; min-width: 0; }
1375.rui-form label small { font-size: var(--fs-sm); line-height: 1.35; }
1376.rui-form label.rui-check { flex-direction: row; align-items: center; gap: var(--sp-2); }
1377.rui-form label.rui-wide { grid-column: 1 / -1; }
1378.rui-form textarea { font-family: var(--mono); font-size: var(--fs-sm); }
1379.rui-rec { color: var(--blue-deep); }
1380.rui-rec::before { content: "★ "; }
1381.rui-actions { display: flex; justify-content: flex-end; }
1382.rui-table { width: 100%; min-width: 560px; border-collapse: collapse; background: var(--card); }
1383.rui-table td.act { width: 1%; white-space: nowrap; text-align: right; }
1384.rui-table form { margin: 0; }
1385.rui-table td code { white-space: nowrap; }
1386.rui-table th { text-align: left; font-size: var(--fs-sm); color: var(--muted); }
1387.rui-table td, .rui-table th { padding: 6px 8px; border-bottom: 1px solid var(--line); vertical-align: top; }
1388.rui-st { font-size: var(--fs-sm); font-weight: 600; border-radius: 999px; padding: 1px 8px; border: 1px solid var(--line); }
1389.rui-st.success { color: var(--ok); background: #e5f6ec; }
1390.rui-st.failed { color: var(--bad); background: #fde8e8; }
1391.rui-st.canceled { color: var(--muted); }
1392.pill.rui-own { background: var(--blue-soft); border-color: #bcd3fb; color: var(--blue-deep); }
1393.rui-add { margin-top: var(--sp-3); }
1394.rui-add summary { cursor: pointer; font-weight: 600; color: var(--blue-deep); margin-bottom: var(--sp-2); }
1395.rui-foot p { margin: 0; overflow-wrap: anywhere; }
1396.rui-foot code { font-size: var(--fs-sm); }
1397.rui-doc h2 { margin-top: var(--sp-5); }
1398.rui-doc pre { max-width: 100%; overflow-x: auto; }
1399.rui-login { max-width: 420px; margin: var(--sp-6) auto; }
1400.rui-login input { width: 100%; }
1401.rui-langs { display: flex; gap: var(--sp-2); }
1402.rui-langs a { opacity: .75; font-size: var(--fs-sm); }
1403.rui-langs a.on { opacity: 1; font-weight: 600; text-decoration: underline; }
1404@media (max-width: 720px) {
1405 .rui-head { flex-direction: column; }
1406 .rui-form fieldset { grid-template-columns: 1fr; padding: var(--sp-2) var(--sp-3); }
1407 .rui-big { font-size: 22px; }
1408 .top:has(.rui-nav) { height: auto; min-height: var(--top-h); flex-wrap: wrap; row-gap: 4px; padding-top: 6px; padding-bottom: 6px; }
1409 .top nav.rui-nav { gap: var(--sp-2); font-size: var(--fs-sm); flex-wrap: wrap; }
1410 .top .brand { font-size: 14px; white-space: nowrap; }
1411 .rui-sechead form, .rui-sechead button { width: 100%; }
1412}
internal/server/templates/collab.html +3 −3
@@ -350,7 +350,7 @@
350 350 <header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
351 351 {{template "pipenav" .}}
352 352 <div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}</div>
353 <p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>
353 <p class="muted">{{t "pipe.runningOn" .RunnerName}} · <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
354 354 <ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
355 355 {{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
356 356 </ul>
@@ -467,7 +467,7 @@
467 467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
468 468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
469 469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
470 <dt>{{t "pipe.runner"}}</dt><dd>{{or .Runner $.RunnerName}}</dd>
470 <dt>{{t "pipe.runner"}}</dt><dd><span>{{or .Runner $.RunnerName}}</span> <a class="helplink" href="/help/runners">{{t "help.what"}}</a></dd>
471 471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
472 472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
473 473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
@@ -920,7 +920,7 @@
920 920 {{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
921 921 {{end}}
922 922 <h2 id="runners">{{t "runner.title"}}</h2>
923 <p class="muted">{{t "runner.groupLead"}}</p>
923 <p class="muted">{{t "runner.groupLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
924 924 <form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
@@ -350,7 +350,7 @@
350<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
350<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
351{{template "pipenav" .}}
351{{template "pipenav" .}}
352<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}</div>
352<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}</div>
353<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>
353<p class="muted">{{t "pipe.runningOn" .RunnerName}} · <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
354<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
354<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
355{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
355{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
356</ul>
356</ul>
@@ -467,7 +467,7 @@
467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
470 <dt>{{t "pipe.runner"}}</dt><dd>{{or .Runner $.RunnerName}}</dd>
470 <dt>{{t "pipe.runner"}}</dt><dd><span>{{or .Runner $.RunnerName}}</span> <a class="helplink" href="/help/runners">{{t "help.what"}}</a></dd>
471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
@@ -920,7 +920,7 @@
920{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
920{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
921{{end}}
921{{end}}
922<h2 id="runners">{{t "runner.title"}}</h2>
922<h2 id="runners">{{t "runner.title"}}</h2>
923<p class="muted">{{t "runner.groupLead"}}</p>
923<p class="muted">{{t "runner.groupLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
924<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
924<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
internal/server/templates/help.html added +29 −0
@@ -0,0 +1,29 @@
1 {{define "help"}}
2 {{template "layout-start" .}}
3 {{if .HelpDoc}}
4 <p class="crumbs"><a href="/help">{{t "title.help"}}</a> <span aria-hidden="true">/</span> <span>{{.HelpDoc.Title}}</span></p>
5 {{if .HelpDoc.Fallback}}<p class="flash">{{t "help.fallback"}}</p>{{end}}
6 <article class="readme helpdoc">
7 <div class="mdbody">{{.HelpDoc.HTML}}</div>
8 </article>
9 {{else}}
10 <h1>{{t "title.help"}}</h1>
11 <p class="lead muted">{{t "help.lead"}}</p>
12 <div class="helpgrid">
13 {{range .HelpDocs}}
14 <a class="panel helpcard" href="/help/{{.Slug}}">
15 <strong>{{.Title}}</strong>
16 {{if .Summary}}<span class="muted">{{.Summary}}</span>{{end}}
17 {{if .Fallback}}<span class="pill">{{t "help.otherLang"}}</span>{{end}}
18 </a>
19 {{end}}
20 </div>
21 {{end}}
22 {{template "layout-end" .}}
23 {{end}}
24
25 {{define "adminrunner"}}
26 {{template "layout-start" .}}
27 {{.RunnerUI}}
28 {{template "layout-end" .}}
29 {{end}}
@@ -0,0 +1,29 @@
1{{define "help"}}
2{{template "layout-start" .}}
3{{if .HelpDoc}}
4<p class="crumbs"><a href="/help">{{t "title.help"}}</a> <span aria-hidden="true">/</span> <span>{{.HelpDoc.Title}}</span></p>
5{{if .HelpDoc.Fallback}}<p class="flash">{{t "help.fallback"}}</p>{{end}}
6<article class="readme helpdoc">
7 <div class="mdbody">{{.HelpDoc.HTML}}</div>
8</article>
9{{else}}
10<h1>{{t "title.help"}}</h1>
11<p class="lead muted">{{t "help.lead"}}</p>
12<div class="helpgrid">
13 {{range .HelpDocs}}
14 <a class="panel helpcard" href="/help/{{.Slug}}">
15 <strong>{{.Title}}</strong>
16 {{if .Summary}}<span class="muted">{{.Summary}}</span>{{end}}
17 {{if .Fallback}}<span class="pill">{{t "help.otherLang"}}</span>{{end}}
18 </a>
19 {{end}}
20</div>
21{{end}}
22{{template "layout-end" .}}
23{{end}}
24
25{{define "adminrunner"}}
26{{template "layout-start" .}}
27{{.RunnerUI}}
28{{template "layout-end" .}}
29{{end}}
internal/server/templates/layout.html +24 −3
@@ -34,17 +34,19 @@
34 34 <a href="/">{{t "nav.dashboard"}}</a>
35 35 <a href="/new">{{t "nav.new"}}</a>
36 36 <a href="/-/info">{{t "nav.info"}}</a>
37 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
37 <a href="/help">{{t "nav.help"}}</a>
38 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a><a href="/admin/runner">{{t "nav.adminRunner"}}</a>{{end}}
38 39 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 40 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
40 41 {{else}}
41 42 <a href="/-/info">{{t "nav.info"}}</a>
43 <a href="/help">{{t "nav.help"}}</a>
42 44 <a class="btn" href="/login">{{t "nav.signin"}}</a>
43 45 {{end}}
44 46 </nav>
45 47 </header>
46 <div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
47 {{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
48 <div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
49 {{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
48 50 <div class="content">
49 51 <main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
50 52 {{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
@@ -64,6 +66,12 @@
64 66 </main>
65 67 </div>
66 68 </div>
69 <footer class="foot">
70 <a href="/help">{{t "nav.help"}}</a>
71 <a href="/help/runners">{{t "help.runners"}}</a>
72 <a href="/help/agents">{{t "help.api"}}</a>
73 <a href="/-/info">{{t "nav.info"}}</a>
74 </footer>
67 75 <script src="/assets/float.js"></script>
68 76 <script src="/assets/confirm.js"></script>
69 77 </body>
@@ -107,6 +115,19 @@
107 115 </aside>
108 116 {{end}}
109 117
118 {{define "helpside"}}
119 <aside class="sidenav">
120 <a class="sidecontext" href="/help">
121 <span class="sidename">{{t "title.help"}}</span>
122 </a>
123 <nav class="sidenav-links">
124 {{range .HelpDocs}}
125 <a href="/help/{{.Slug}}"{{if .On}} class="on"{{end}}>{{.Title}}</a>
126 {{end}}
127 </nav>
128 </aside>
129 {{end}}
130
110 131 {{define "infoside"}}
111 132 <aside class="sidenav">
112 133 <a class="sidecontext" href="/-/info">
@@ -34,17 +34,19 @@
34 <a href="/">{{t "nav.dashboard"}}</a>
34 <a href="/">{{t "nav.dashboard"}}</a>
35 <a href="/new">{{t "nav.new"}}</a>
35 <a href="/new">{{t "nav.new"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
37 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
37 <a href="/help">{{t "nav.help"}}</a>
38 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a><a href="/admin/runner">{{t "nav.adminRunner"}}</a>{{end}}
38 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
40 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
40 {{else}}
41 {{else}}
41 <a href="/-/info">{{t "nav.info"}}</a>
42 <a href="/-/info">{{t "nav.info"}}</a>
43 <a href="/help">{{t "nav.help"}}</a>
42 <a class="btn" href="/login">{{t "nav.signin"}}</a>
44 <a class="btn" href="/login">{{t "nav.signin"}}</a>
43 {{end}}
45 {{end}}
44 </nav>
46 </nav>
45</header>
47</header>
46<div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
48<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
47{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
49{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
48<div class="content">
50<div class="content">
49<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
51<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
50{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
52{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
@@ -64,6 +66,12 @@
64</main>
66</main>
65</div>
67</div>
66</div>
68</div>
69<footer class="foot">
70 <a href="/help">{{t "nav.help"}}</a>
71 <a href="/help/runners">{{t "help.runners"}}</a>
72 <a href="/help/agents">{{t "help.api"}}</a>
73 <a href="/-/info">{{t "nav.info"}}</a>
74</footer>
67<script src="/assets/float.js"></script>
75<script src="/assets/float.js"></script>
68<script src="/assets/confirm.js"></script>
76<script src="/assets/confirm.js"></script>
69</body>
77</body>
@@ -107,6 +115,19 @@
107</aside>
115</aside>
108{{end}}
116{{end}}
109
117
118{{define "helpside"}}
119<aside class="sidenav">
120 <a class="sidecontext" href="/help">
121 <span class="sidename">{{t "title.help"}}</span>
122 </a>
123 <nav class="sidenav-links">
124 {{range .HelpDocs}}
125 <a href="/help/{{.Slug}}"{{if .On}} class="on"{{end}}>{{.Title}}</a>
126 {{end}}
127 </nav>
128</aside>
129{{end}}
130
110{{define "infoside"}}
131{{define "infoside"}}
111<aside class="sidenav">
132<aside class="sidenav">
112 <a class="sidecontext" href="/-/info">
133 <a class="sidecontext" href="/-/info">
internal/server/templates/pages.html +2 −2
@@ -304,7 +304,7 @@
304 304 </section>
305 305 <section class="panel" id="runners">
306 306 <h2>{{t "runner.title"}}</h2>
307 <p class="muted">{{t "runner.userLead"}}</p>
307 <p class="muted">{{t "runner.userLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
308 308 <form method="post" action="/settings/runners/pref">
309 309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
@@ -701,7 +701,7 @@
701 701 <tbody>
702 702 {{range .Runners}}<tr>
703 703 <td>{{.Name}}</td>
704 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
704 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if and .Draining .Online}}<span class="pill">{{t "runner.draining"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
705 705 <td>{{date .LastSeen}}</td>
706 706 <td>{{.Version}}</td>
707 707 <td class="act">
@@ -304,7 +304,7 @@
304</section>
304</section>
305<section class="panel" id="runners">
305<section class="panel" id="runners">
306 <h2>{{t "runner.title"}}</h2>
306 <h2>{{t "runner.title"}}</h2>
307 <p class="muted">{{t "runner.userLead"}}</p>
307 <p class="muted">{{t "runner.userLead"}} <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
308 <form method="post" action="/settings/runners/pref">
308 <form method="post" action="/settings/runners/pref">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
@@ -701,7 +701,7 @@
701 <tbody>
701 <tbody>
702 {{range .Runners}}<tr>
702 {{range .Runners}}<tr>
703 <td>{{.Name}}</td>
703 <td>{{.Name}}</td>
704 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
704 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if and .Draining .Online}}<span class="pill">{{t "runner.draining"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
705 <td>{{date .LastSeen}}</td>
705 <td>{{date .LastSeen}}</td>
706 <td>{{.Version}}</td>
706 <td>{{.Version}}</td>
707 <td class="act">
707 <td class="act">
internal/store/runners.go +16 −4
@@ -20,6 +20,8 @@ type Runner struct {
20 20 Version string
21 21 Revoked bool
22 22 Paused bool
23 // Draining: de runner zelf staat lokaal op pauze (drain); lopende jobs lopen af.
24 Draining bool
23 25 }
24 26
25 27 // RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.
@@ -92,16 +94,16 @@ func (s *Store) RegisterRunner(ctx context.Context, regToken, name, version stri
92 94 return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil
93 95 }
94 96
95 const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused`
97 const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused, draining`
96 98
97 99 func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {
98 100 var r Runner
99 101 var created, seen string
100 var revoked, paused int
101 if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused); err != nil {
102 var revoked, paused, draining int
103 if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused, &draining); err != nil {
102 104 return Runner{}, err
103 105 }
104 r.CreatedAt, r.LastSeen, r.Revoked, r.Paused = parseTime(created), parseTime(seen), revoked == 1, paused == 1
106 r.CreatedAt, r.LastSeen, r.Revoked, r.Paused, r.Draining = parseTime(created), parseTime(seen), revoked == 1, paused == 1, draining == 1
105 107 return r, nil
106 108 }
107 109
@@ -132,6 +134,16 @@ func (s *Store) TouchRunner(ctx context.Context, id int64, version string) error
132 134 return err
133 135 }
134 136
137 // SetRunnerDraining slaat de lokale pauze van de runner op (uit de heartbeat).
138 func (s *Store) SetRunnerDraining(ctx context.Context, id int64, draining bool) error {
139 v := 0
140 if draining {
141 v = 1
142 }
143 _, err := s.db.ExecContext(ctx, `UPDATE runners SET draining = ? WHERE id = ?`, v, id)
144 return err
145 }
146
135 147 // ListRunners geeft de niet-ingetrokken runners van een eigenaar.
136 148 func (s *Store) ListRunners(ctx context.Context, ownerKind string, ownerID int64) ([]Runner, error) {
137 149 rows, err := s.db.QueryContext(ctx, `SELECT `+runnerCols+` FROM runners WHERE owner_kind = ? AND owner_id = ? AND revoked = 0 ORDER BY id`, ownerKind, ownerID)
@@ -20,6 +20,8 @@ type Runner struct {
20 Version string
20 Version string
21 Revoked bool
21 Revoked bool
22 Paused bool
22 Paused bool
23 // Draining: de runner zelf staat lokaal op pauze (drain); lopende jobs lopen af.
24 Draining bool
23}
25}
24
26
25// RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.
27// RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.
@@ -92,16 +94,16 @@ func (s *Store) RegisterRunner(ctx context.Context, regToken, name, version stri
92 return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil
94 return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil
93}
95}
94
96
95const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused`
97const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused, draining`
96
98
97func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {
99func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {
98 var r Runner
100 var r Runner
99 var created, seen string
101 var created, seen string
100 var revoked, paused int
102 var revoked, paused, draining int
101 if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused); err != nil {
103 if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused, &draining); err != nil {
102 return Runner{}, err
104 return Runner{}, err
103 }
105 }
104 r.CreatedAt, r.LastSeen, r.Revoked, r.Paused = parseTime(created), parseTime(seen), revoked == 1, paused == 1
106 r.CreatedAt, r.LastSeen, r.Revoked, r.Paused, r.Draining = parseTime(created), parseTime(seen), revoked == 1, paused == 1, draining == 1
105 return r, nil
107 return r, nil
106}
108}
107
109
@@ -132,6 +134,16 @@ func (s *Store) TouchRunner(ctx context.Context, id int64, version string) error
132 return err
134 return err
133}
135}
134
136
137// SetRunnerDraining slaat de lokale pauze van de runner op (uit de heartbeat).
138func (s *Store) SetRunnerDraining(ctx context.Context, id int64, draining bool) error {
139 v := 0
140 if draining {
141 v = 1
142 }
143 _, err := s.db.ExecContext(ctx, `UPDATE runners SET draining = ? WHERE id = ?`, v, id)
144 return err
145}
146
135// ListRunners geeft de niet-ingetrokken runners van een eigenaar.
147// ListRunners geeft de niet-ingetrokken runners van een eigenaar.
136func (s *Store) ListRunners(ctx context.Context, ownerKind string, ownerID int64) ([]Runner, error) {
148func (s *Store) ListRunners(ctx context.Context, ownerKind string, ownerID int64) ([]Runner, error) {
137 rows, err := s.db.QueryContext(ctx, `SELECT `+runnerCols+` FROM runners WHERE owner_kind = ? AND owner_id = ? AND revoked = 0 ORDER BY id`, ownerKind, ownerID)
149 rows, err := s.db.QueryContext(ctx, `SELECT `+runnerCols+` FROM runners WHERE owner_kind = ? AND owner_id = ? AND revoked = 0 ORDER BY id`, ownerKind, ownerID)
internal/store/store.go +1 −0
@@ -105,6 +105,7 @@ func (s *Store) migrate() error {
105 105 `ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,
106 106 `ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,
107 107 `ALTER TABLE runners ADD COLUMN paused INTEGER NOT NULL DEFAULT 0`,
108 `ALTER TABLE runners ADD COLUMN draining INTEGER NOT NULL DEFAULT 0`,
108 109 }
109 110 for _, q := range alters {
110 111 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -105,6 +105,7 @@ func (s *Store) migrate() error {
105 `ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,
105 `ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,
106 `ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,
106 `ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,
107 `ALTER TABLE runners ADD COLUMN paused INTEGER NOT NULL DEFAULT 0`,
107 `ALTER TABLE runners ADD COLUMN paused INTEGER NOT NULL DEFAULT 0`,
108 `ALTER TABLE runners ADD COLUMN draining INTEGER NOT NULL DEFAULT 0`,
108 }
109 }
109 for _, q := range alters {
110 for _, q := range alters {
110 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
111 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
packaging/runner/bluegit-runner.service +1 −1
@@ -1,6 +1,6 @@
1 1 [Unit]
2 2 Description=BlueGit runner (separate CI runner)
3 Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/master/docs/runner.md
3 Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/docs/runner.md
4 4 After=network-online.target docker.service
5 5 Wants=network-online.target
6 6 # Pas na "bluegit-runner register" is er een config.
@@ -1,6 +1,6 @@
1[Unit]
1[Unit]
2Description=BlueGit runner (separate CI runner)
2Description=BlueGit runner (separate CI runner)
3Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/master/docs/runner.md
3Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/docs/runner.md
4After=network-online.target docker.service
4After=network-online.target docker.service
5Wants=network-online.target
5Wants=network-online.target
6# Pas na "bluegit-runner register" is er een config.
6# Pas na "bluegit-runner register" is er een config.
packaging/runner/config.yml.example +3 −0
@@ -10,3 +10,6 @@ name: my-machine
10 10 # work_dir: /var/lib/bluegit-runner
11 11 # network: bridge
12 12 # concurrency: 1
13 # Web UI (admin token: sudo bluegit-runner ui-token); "off" disables it.
14 # ui_listen: 127.0.0.1:8765
15 # language: en
@@ -10,3 +10,6 @@ name: my-machine
10# work_dir: /var/lib/bluegit-runner
10# work_dir: /var/lib/bluegit-runner
11# network: bridge
11# network: bridge
12# concurrency: 1
12# concurrency: 1
13# Web UI (admin token: sudo bluegit-runner ui-token); "off" disables it.
14# ui_listen: 127.0.0.1:8765
15# language: en