+6 -1

spindle/config/config.go

reviewed

··· 45 45 LogBucket string `env:"LOG_BUCKET"` 46 46 } 47 47 48 48 + type DockerPipelines struct { 49 49 + WorkflowTimeout string `env:"WORKFLOW_TIMEOUT, default=5m"` 50 50 + } 51 51 + 48 52 type Config struct { 49 53 Server Server `env:",prefix=SPINDLE_SERVER_"` 54 54 + S3 S3 `env:",prefix=SPINDLE_S3_"` 50 55 NixeryPipelines NixeryPipelines `env:",prefix=SPINDLE_NIXERY_PIPELINES_"` 51 51 - S3 S3 `env:",prefix=SPINDLE_S3_"` 56 56 + DockerPipelines DockerPipelines `env:",prefix=SPINDLE_DOCKER_PIPELINES_"` 52 57 } 53 58 54 59 func Load(ctx context.Context) (*Config, error) {

+398

spindle/engines/docker/engine.go

reviewed

··· 1 1 + package docker 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "errors" 6 6 + "fmt" 7 7 + "io" 8 8 + "log/slog" 9 9 + "os" 10 10 + "sync" 11 11 + "time" 12 12 + 13 13 + "github.com/docker/docker/api/types/container" 14 14 + "github.com/docker/docker/api/types/image" 15 15 + "github.com/docker/docker/api/types/mount" 16 16 + "github.com/docker/docker/api/types/network" 17 17 + "github.com/docker/docker/client" 18 18 + "github.com/docker/docker/pkg/stdcopy" 19 19 + "gopkg.in/yaml.v3" 20 20 + "tangled.org/core/api/tangled" 21 21 + "tangled.org/core/log" 22 22 + "tangled.org/core/spindle/config" 23 23 + "tangled.org/core/spindle/engine" 24 24 + "tangled.org/core/spindle/engines/common" 25 25 + engineerrors "tangled.org/core/spindle/engines/errors" 26 26 + "tangled.org/core/spindle/models" 27 27 + "tangled.org/core/spindle/secrets" 28 28 + ) 29 29 + 30 30 + const ( 31 31 + workspaceDir = "/tangled/workspace" 32 32 + homeDir = "/tangled/home" 33 33 + defaultImage = "ubuntu:22.04" 34 34 + ) 35 35 + 36 36 + type cleanupFunc func(context.Context) error 37 37 + 38 38 + type Engine struct { 39 39 + docker client.APIClient 40 40 + l *slog.Logger 41 41 + cfg *config.Config 42 42 + 43 43 + cleanupMu sync.Mutex 44 44 + cleanup map[string][]cleanupFunc 45 45 + } 46 46 + 47 47 + type Step struct { 48 48 + name string 49 49 + kind models.StepKind 50 50 + command string 51 51 + environment map[string]string 52 52 + } 53 53 + 54 54 + func (s Step) Name() string { 55 55 + return s.name 56 56 + } 57 57 + 58 58 + func (s Step) Command() string { 59 59 + return s.command 60 60 + } 61 61 + 62 62 + func (s Step) Kind() models.StepKind { 63 63 + return s.kind 64 64 + } 65 65 + 66 66 + // setupSteps get added to start of Steps 67 67 + type setupSteps []models.Step 68 68 + 69 69 + // addStep adds a step to the beginning of the workflow's steps. 70 70 + func (ss *setupSteps) addStep(step models.Step) { 71 71 + *ss = append(*ss, step) 72 72 + } 73 73 + 74 74 + type addlFields struct { 75 75 + image string 76 76 + container string 77 77 + } 78 78 + 79 79 + func (e *Engine) InitWorkflow(twf tangled.Pipeline_Workflow, tpl tangled.Pipeline) (*models.Workflow, error) { 80 80 + swf := &models.Workflow{} 81 81 + addl := addlFields{} 82 82 + 83 83 + dwf := &struct { 84 84 + Steps []struct { 85 85 + Command string `yaml:"command"` 86 86 + Name string `yaml:"name"` 87 87 + Environment map[string]string `yaml:"environment"` 88 88 + } `yaml:"steps"` 89 89 + Environment map[string]string `yaml:"environment"` 90 90 + Image string `yaml:"image"` 91 91 + }{} 92 92 + err := yaml.Unmarshal([]byte(twf.Raw), &dwf) 93 93 + if err != nil { 94 94 + return nil, err 95 95 + } 96 96 + 97 97 + for _, dstep := range dwf.Steps { 98 98 + sstep := Step{} 99 99 + sstep.environment = dstep.Environment 100 100 + sstep.command = dstep.Command 101 101 + sstep.name = dstep.Name 102 102 + sstep.kind = models.StepKindUser 103 103 + swf.Steps = append(swf.Steps, sstep) 104 104 + } 105 105 + swf.Name = twf.Name 106 106 + swf.Environment = dwf.Environment 107 107 + 108 108 + // Use specified image or default 109 109 + if dwf.Image != "" { 110 110 + addl.image = dwf.Image 111 111 + } else { 112 112 + addl.image = defaultImage 113 113 + } 114 114 + 115 115 + setup := &setupSteps{} 116 116 + 117 117 + // Add clone step 118 118 + setup.addStep(models.BuildCloneStep(twf, *tpl.TriggerMetadata, e.cfg.Server.Dev)) 119 119 + 120 120 + // append setup steps in order to the start of workflow steps 121 121 + swf.Steps = append(*setup, swf.Steps...) 122 122 + swf.Data = addl 123 123 + 124 124 + return swf, nil 125 125 + } 126 126 + 127 127 + func (e *Engine) WorkflowTimeout() time.Duration { 128 128 + workflowTimeoutStr := e.cfg.DockerPipelines.WorkflowTimeout 129 129 + workflowTimeout, err := time.ParseDuration(workflowTimeoutStr) 130 130 + if err != nil { 131 131 + e.l.Error("failed to parse workflow timeout", "error", err, "timeout", workflowTimeoutStr) 132 132 + workflowTimeout = 5 * time.Minute 133 133 + } 134 134 + 135 135 + return workflowTimeout 136 136 + } 137 137 + 138 138 + func New(ctx context.Context, cfg *config.Config) (*Engine, error) { 139 139 + dcli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) 140 140 + if err != nil { 141 141 + return nil, err 142 142 + } 143 143 + 144 144 + l := log.FromContext(ctx).With("component", "spindle-docker") 145 145 + 146 146 + e := &Engine{ 147 147 + docker: dcli, 148 148 + l: l, 149 149 + cfg: cfg, 150 150 + } 151 151 + 152 152 + e.cleanup = make(map[string][]cleanupFunc) 153 153 + 154 154 + return e, nil 155 155 + } 156 156 + 157 157 + func (e *Engine) SetupWorkflow(ctx context.Context, wid models.WorkflowId, wf *models.Workflow) error { 158 158 + e.l.Info("setting up workflow", "workflow", wid) 159 159 + 160 160 + _, err := e.docker.NetworkCreate(ctx, networkName(wid), network.CreateOptions{ 161 161 + Driver: "bridge", 162 162 + }) 163 163 + if err != nil { 164 164 + return err 165 165 + } 166 166 + e.registerCleanup(wid, func(ctx context.Context) error { 167 167 + return e.docker.NetworkRemove(ctx, networkName(wid)) 168 168 + }) 169 169 + 170 170 + addl := wf.Data.(addlFields) 171 171 + 172 172 + reader, err := e.docker.ImagePull(ctx, addl.image, image.PullOptions{}) 173 173 + if err != nil { 174 174 + e.l.Error("pipeline image pull failed!", "image", addl.image, "workflowId", wid, "error", err.Error()) 175 175 + 176 176 + return fmt.Errorf("pulling image: %w", err) 177 177 + } 178 178 + defer reader.Close() 179 179 + io.Copy(os.Stdout, reader) 180 180 + 181 181 + resp, err := e.docker.ContainerCreate(ctx, &container.Config{ 182 182 + Image: addl.image, 183 183 + Cmd: []string{"sleep", "infinity"}, // Keep container running 184 184 + OpenStdin: true, 185 185 + Tty: false, 186 186 + Hostname: "spindle", 187 187 + WorkingDir: workspaceDir, 188 188 + Labels: map[string]string{ 189 189 + "sh.tangled.pipeline/workflow_id": wid.String(), 190 190 + }, 191 191 + }, &container.HostConfig{ 192 192 + Mounts: []mount.Mount{ 193 193 + { 194 194 + Type: mount.TypeTmpfs, 195 195 + Target: "/tmp", 196 196 + ReadOnly: false, 197 197 + TmpfsOptions: &mount.TmpfsOptions{ 198 198 + Mode: 0o1777, // world-writeable sticky bit 199 199 + Options: [][]string{ 200 200 + {"exec"}, 201 201 + }, 202 202 + }, 203 203 + }, 204 204 + }, 205 205 + ReadonlyRootfs: false, 206 206 + CapDrop: []string{"ALL"}, 207 207 + CapAdd: []string{"CAP_DAC_OVERRIDE", "CAP_CHOWN", "CAP_FOWNER", "CAP_SETUID", "CAP_SETGID"}, 208 208 + SecurityOpt: []string{"no-new-privileges"}, 209 209 + ExtraHosts: []string{"host.docker.internal:host-gateway"}, 210 210 + }, nil, nil, "") 211 211 + if err != nil { 212 212 + return fmt.Errorf("creating container: %w", err) 213 213 + } 214 214 + e.registerCleanup(wid, func(ctx context.Context) error { 215 215 + err = e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}) 216 216 + if err != nil { 217 217 + return err 218 218 + } 219 219 + 220 220 + return e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 221 221 + RemoveVolumes: true, 222 222 + RemoveLinks: false, 223 223 + Force: false, 224 224 + }) 225 225 + }) 226 226 + 227 227 + err = e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}) 228 228 + if err != nil { 229 229 + return fmt.Errorf("starting container: %w", err) 230 230 + } 231 231 + 232 232 + // Create necessary directories 233 233 + mkExecResp, err := e.docker.ContainerExecCreate(ctx, resp.ID, container.ExecOptions{ 234 234 + Cmd: []string{"mkdir", "-p", workspaceDir, homeDir}, 235 235 + AttachStdout: true, 236 236 + AttachStderr: true, 237 237 + }) 238 238 + if err != nil { 239 239 + return err 240 240 + } 241 241 + 242 242 + // This actually *starts* the command. Thanks, Docker! 243 243 + execResp, err := e.docker.ContainerExecAttach(ctx, mkExecResp.ID, container.ExecAttachOptions{}) 244 244 + if err != nil { 245 245 + return err 246 246 + } 247 247 + defer execResp.Close() 248 248 + 249 249 + // This is apparently best way to wait for the command to complete. 250 250 + _, err = io.ReadAll(execResp.Reader) 251 251 + if err != nil { 252 252 + return err 253 253 + } 254 254 + 255 255 + execInspectResp, err := e.docker.ContainerExecInspect(ctx, mkExecResp.ID) 256 256 + if err != nil { 257 257 + return err 258 258 + } 259 259 + 260 260 + if execInspectResp.ExitCode != 0 { 261 261 + return fmt.Errorf("mkdir exited with exit code %d", execInspectResp.ExitCode) 262 262 + } else if execInspectResp.Running { 263 263 + return errors.New("mkdir is somehow still running??") 264 264 + } 265 265 + 266 266 + addl.container = resp.ID 267 267 + wf.Data = addl 268 268 + 269 269 + return nil 270 270 + } 271 271 + 272 272 + func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger *models.WorkflowLogger) error { 273 273 + addl := w.Data.(addlFields) 274 274 + workflowEnvs := common.ConstructEnvs(w.Environment) 275 275 + for _, s := range secrets { 276 276 + workflowEnvs.AddEnv(s.Key, s.Value) 277 277 + } 278 278 + 279 279 + step := w.Steps[idx] 280 280 + 281 281 + select { 282 282 + case <-ctx.Done(): 283 283 + return ctx.Err() 284 284 + default: 285 285 + } 286 286 + 287 287 + envs := append(common.EnvVars(nil), workflowEnvs...) 288 288 + if dockerStep, ok := step.(Step); ok { 289 289 + for k, v := range dockerStep.environment { 290 290 + envs.AddEnv(k, v) 291 291 + } 292 292 + } 293 293 + envs.AddEnv("HOME", homeDir) 294 294 + 295 295 + mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{ 296 296 + Cmd: []string{"sh", "-c", step.Command()}, 297 297 + AttachStdout: true, 298 298 + AttachStderr: true, 299 299 + Env: envs, 300 300 + }) 301 301 + if err != nil { 302 302 + return fmt.Errorf("creating exec: %w", err) 303 303 + } 304 304 + 305 305 + // start tailing logs in background 306 306 + tailDone := make(chan error, 1) 307 307 + go func() { 308 308 + tailDone <- e.tailStep(ctx, wfLogger, mkExecResp.ID, wid, idx, step) 309 309 + }() 310 310 + 311 311 + select { 312 312 + case <-tailDone: 313 313 + 314 314 + case <-ctx.Done(): 315 315 + e.l.Warn("step timed out", "step", step.Name()) 316 316 + <-tailDone 317 317 + return engine.ErrTimedOut 318 318 + } 319 319 + 320 320 + select { 321 321 + case <-ctx.Done(): 322 322 + return ctx.Err() 323 323 + default: 324 324 + } 325 325 + 326 326 + execInspectResp, err := e.docker.ContainerExecInspect(ctx, mkExecResp.ID) 327 327 + if err != nil { 328 328 + return err 329 329 + } 330 330 + 331 331 + if execInspectResp.ExitCode != 0 { 332 332 + inspectResp, err := e.docker.ContainerInspect(ctx, addl.container) 333 333 + if err != nil { 334 334 + return err 335 335 + } 336 336 + 337 337 + e.l.Error("workflow failed!", "workflow_id", wid.String(), "exit_code", execInspectResp.ExitCode, "oom_killed", inspectResp.State.OOMKilled) 338 338 + 339 339 + if inspectResp.State.OOMKilled { 340 340 + return engineerrors.ErrOOMKilled 341 341 + } 342 342 + return engine.ErrWorkflowFailed 343 343 + } 344 344 + 345 345 + return nil 346 346 + } 347 347 + 348 348 + func (e *Engine) tailStep(ctx context.Context, wfLogger *models.WorkflowLogger, execID string, wid models.WorkflowId, stepIdx int, step models.Step) error { 349 349 + if wfLogger == nil { 350 350 + return nil 351 351 + } 352 352 + 353 353 + // This actually *starts* the command. Thanks, Docker! 354 354 + logs, err := e.docker.ContainerExecAttach(ctx, execID, container.ExecAttachOptions{}) 355 355 + if err != nil { 356 356 + return err 357 357 + } 358 358 + defer logs.Close() 359 359 + 360 360 + _, err = stdcopy.StdCopy( 361 361 + wfLogger.DataWriter(stepIdx, "stdout"), 362 362 + wfLogger.DataWriter(stepIdx, "stderr"), 363 363 + logs.Reader, 364 364 + ) 365 365 + if err != nil && err != io.EOF && !errors.Is(err, context.DeadlineExceeded) { 366 366 + return fmt.Errorf("failed to copy logs: %w", err) 367 367 + } 368 368 + 369 369 + return nil 370 370 + } 371 371 + 372 372 + func (e *Engine) DestroyWorkflow(ctx context.Context, wid models.WorkflowId) error { 373 373 + e.cleanupMu.Lock() 374 374 + key := wid.String() 375 375 + 376 376 + fns := e.cleanup[key] 377 377 + delete(e.cleanup, key) 378 378 + e.cleanupMu.Unlock() 379 379 + 380 380 + for _, fn := range fns { 381 381 + if err := fn(ctx); err != nil { 382 382 + e.l.Error("failed to cleanup workflow resource", "workflowId", wid, "error", err) 383 383 + } 384 384 + } 385 385 + return nil 386 386 + } 387 387 + 388 388 + func (e *Engine) registerCleanup(wid models.WorkflowId, fn cleanupFunc) { 389 389 + e.cleanupMu.Lock() 390 390 + defer e.cleanupMu.Unlock() 391 391 + 392 392 + key := wid.String() 393 393 + e.cleanup[key] = append(e.cleanup[key], fn) 394 394 + } 395 395 + 396 396 + func networkName(wid models.WorkflowId) string { 397 397 + return fmt.Sprintf("workflow-network-%s", wid) 398 398 + }

+7

spindle/server.go

reviewed

··· 22 22 "tangled.org/core/spindle/config" 23 23 "tangled.org/core/spindle/db" 24 24 "tangled.org/core/spindle/engine" 25 25 + "tangled.org/core/spindle/engines/docker" 25 26 "tangled.org/core/spindle/engines/nixery" 26 27 "tangled.org/core/spindle/models" 27 28 "tangled.org/core/spindle/queue" ··· 250 251 return err 251 252 } 252 253 254 254 + dockerEng, err := docker.New(ctx, cfg) 255 255 + if err != nil { 256 256 + return err 257 257 + } 258 258 + 253 259 s, err := New(ctx, cfg, map[string]models.Engine{ 254 260 "nixery": nixeryEng, 261 261 + "docker": dockerEng, 255 262 }) 256 263 if err != nil { 257 264 return err