Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: update shimbad
Kyle Mendellf44a4f8caabe
diff --git a/.custom-gcl.yml b/.custom-gcl.ymlindex 39aae7321..025e6b477 100644--- a/.custom-gcl.yml+++ b/.custom-gcl.yml@@ -4,4 +4,4 @@ destination: ./.binplugins:- module: go.ofkm.dev/shimbad- version: v0.1.2+ version: v0.2.0diff --git a/backend/internal/di/di.go b/backend/internal/di/di.goindex 5283cf540..4d3a6af6f 100644--- a/backend/internal/di/di.go+++ b/backend/internal/di/di.go@@ -4,7 +4,9 @@ package diimport ("emperror.dev/emperror"+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity""github.com/getarcaneapp/arcane/backend/v2/internal/actors"+ "github.com/getarcaneapp/arcane/backend/v2/internal/apikey""github.com/getarcaneapp/arcane/backend/v2/internal/apns""github.com/getarcaneapp/arcane/backend/v2/internal/appimages""github.com/getarcaneapp/arcane/backend/v2/internal/auth"@@ -12,10 +14,13 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/build""github.com/getarcaneapp/arcane/backend/v2/internal/diagnostics""github.com/getarcaneapp/arcane/backend/v2/internal/environment"+ "github.com/getarcaneapp/arcane/backend/v2/internal/event""github.com/getarcaneapp/arcane/backend/v2/internal/gitops"+ "github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo""github.com/getarcaneapp/arcane/backend/v2/internal/image""github.com/getarcaneapp/arcane/backend/v2/internal/imagepatch""github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"+ "github.com/getarcaneapp/arcane/backend/v2/internal/job""github.com/getarcaneapp/arcane/backend/v2/internal/kv""github.com/getarcaneapp/arcane/backend/v2/internal/network""github.com/getarcaneapp/arcane/backend/v2/internal/notification"@@ -23,13 +28,18 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/passkey""github.com/getarcaneapp/arcane/backend/v2/internal/port""github.com/getarcaneapp/arcane/backend/v2/internal/project"+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"+ "github.com/getarcaneapp/arcane/backend/v2/internal/role"+ s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3""github.com/getarcaneapp/arcane/backend/v2/internal/search""github.com/getarcaneapp/arcane/backend/v2/internal/session""github.com/getarcaneapp/arcane/backend/v2/internal/swarm""github.com/getarcaneapp/arcane/backend/v2/internal/system""github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"+ "github.com/getarcaneapp/arcane/backend/v2/internal/template""github.com/getarcaneapp/arcane/backend/v2/internal/upload""github.com/getarcaneapp/arcane/backend/v2/internal/variable"+ "github.com/getarcaneapp/arcane/backend/v2/internal/volume""github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability""github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/logging"@@ -53,18 +63,18 @@ var ServiceOptions = fx.Options(// Services constructed directly through their public constructors.provideEventModuleInternal,- provideEventServiceInternal,+ (*event.Module).Service,provideActivityModuleInternal,- provideActivityServiceInternal,+ (*activity.Module).Service,provideSettingsServiceInternal,kv.NewKVService,provideJobModuleInternal,- provideJobServiceInternal,+ (*job.Module).Service,search.New,appimages.NewApplicationImagesService,provideDockerClientServiceInternal,provideRoleModuleInternal,- provideRoleServiceInternal,+ (*role.Module).Service,session.NewSessionService,passkey.NewPasskeyService,environment.NewEnvironmentService,@@ -94,7 +104,7 @@ var ServiceOptions = fx.Options(swarm.NewSwarmService,provideSwarmModuleInternal,provideTemplateModuleInternal,- provideTemplateServiceInternal,+ (*template.Module).Service,oidc.NewOidcService,provideSystemModuleInternal,system.NewSystemUpgradeService,@@ -105,7 +115,7 @@ var ServiceOptions = fx.Options(variable.NewVariableService,variable.New,provideS3ModuleInternal,- provideS3ServiceInternal,+ (*s3domain.Module).Service,provideBackupEngineInternal,backup.NewRecoveryKeyStore,upload.NewUploadService,@@ -114,20 +124,20 @@ var ServiceOptions = fx.Options(// Adapters for scalar config fields, unexported parameters, builders, and lifecycle hooks.provideVersionServiceInternal,provideGitRepositoryModuleInternal,- provideGitRepositoryServiceInternal,+ (*gitrepo.Module).Service,provideVolumeModuleInternal,- provideVolumeServiceInternal,- provideSystemBackupServiceInternal,+ (*volume.Module).Service,+ systembackup.NewSystemBackupService,systembackup.New,auth.NewAuthService,provideAuthModuleInternal,provideContainerRegistryModuleInternal,- provideContainerRegistryServiceInternal,+ (*registry.Module).Service,provideUpdaterModuleInternal,provideUserServiceInternal,provideUserModuleInternal,provideApiKeyModuleInternal,- provideApiKeyServiceInternal,+ (*apikey.Module).Service,provideFederatedCredentialServiceInternal,provideAuthMiddlewareInternal,),diff --git a/backend/internal/di/providers.go b/backend/internal/di/providers.goindex 4610b6c78..ec36e16d5 100644--- a/backend/internal/di/providers.go+++ b/backend/internal/di/providers.go@@ -31,7 +31,6 @@ import (s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3""github.com/getarcaneapp/arcane/backend/v2/internal/settings""github.com/getarcaneapp/arcane/backend/v2/internal/swarm"- "github.com/getarcaneapp/arcane/backend/v2/internal/systembackup""github.com/getarcaneapp/arcane/backend/v2/internal/template""github.com/getarcaneapp/arcane/backend/v2/internal/user""github.com/getarcaneapp/arcane/backend/v2/internal/version"@@ -65,10 +64,6 @@ func provideEventModuleInternal(db *database.DB, cfg *config.Config, httpClientreturn event.New(event.Dependencies{DB: db, Config: cfg, HTTPClient: httpClient})}-func provideEventServiceInternal(module *event.Module) *event.EventService {- return module.Service()-}-func provideActivityModuleInternal(db *database.DB, settingsService *settings.SettingsService, environment *environment.EnvironmentService) *activity.Module {return activity.New(activity.Dependencies{DB: db,@@ -83,10 +78,6 @@ func provideActivityModuleInternal(db *database.DB, settingsService *settings.Se})}-func provideActivityServiceInternal(module *activity.Module) *activity.ActivityService {- return module.Service()-}-func provideEnvironmentModuleInternal(service *environment.EnvironmentService, settingsService *settings.SettingsService, apiKey *apikey.ApiKeyService, eventService *event.EventService, cfg *config.Config, activityService *activity.ActivityService) *environment.Module {return environment.New(service, environment.Dependencies{Settings: settingsService,@@ -126,10 +117,6 @@ func provideRoleModuleInternal(db *database.DB) *role.Module {return role.New(role.Dependencies{DB: db})}-func provideRoleServiceInternal(module *role.Module) *role.RoleService {- return module.Service()-}-func provideSettingsServiceInternal(ctx context.Context, lc fx.Lifecycle, db *database.DB, runtime *actors.Runtime) (*settings.SettingsService, error) {executor, err := actors.NewExecutor(ctx, runtime, "services", "settings", 3)if err != nil {@@ -236,10 +223,6 @@ func provideGitRepositoryModuleInternal(db *database.DB, cfg *config.Config, evereturn gitrepo.New(gitrepo.Dependencies{DB: db, WorkDir: cfg.GitWorkDir, Event: eventService, Settings: settingsService})}-func provideGitRepositoryServiceInternal(module *gitrepo.Module) *gitrepo.GitRepositoryService {- return module.Service()-}-func provideS3ModuleInternal(db *database.DB, environmentService *environment.EnvironmentService) *s3domain.Module {return s3domain.New(s3domain.Dependencies{DB: db,@@ -248,10 +231,6 @@ func provideS3ModuleInternal(db *database.DB, environmentService *environment.En})}-func provideS3ServiceInternal(module *s3domain.Module) *s3domain.S3DestinationService {- return module.Service()-}-func provideVolumeModuleInternal(lc fx.Lifecycle, db *database.DB, dockerService *docker.DockerClientService, eventService *event.EventService, settingsService *settings.SettingsService, imageService *image.ImageService, activityService *activity.ActivityService, containerModule *container.Module, engine *backup.Engine, s3Service *s3domain.S3DestinationService, environmentService *environment.EnvironmentService, cfg *config.Config, uploadService *upload.UploadService, recoveryKeys *backup.RecoveryKeyStore) *volume.Module {module := volume.New(volume.Dependencies{DB: db,@@ -277,14 +256,6 @@ func provideVolumeModuleInternal(lc fx.Lifecycle, db *database.DB, dockerServicereturn module}-func provideVolumeServiceInternal(module *volume.Module) *volume.VolumeService {- return module.Service()-}--func provideSystemBackupServiceInternal(db *database.DB, dockerService *docker.DockerClientService, volumeModule *volume.Module, engine *backup.Engine, s3Service *s3domain.S3DestinationService, activityService *activity.ActivityService, settingsService *settings.SettingsService, cfg *config.Config, recoveryKeys *backup.RecoveryKeyStore) *systembackup.SystemBackupService {- return systembackup.NewSystemBackupService(db, dockerService, volumeModule.Service(), engine, s3Service, activityService, settingsService, cfg, recoveryKeys)-}-func provideContainerModuleInternal(event *event.EventService, docker *docker.DockerClientService, image *image.ImageService, settings *settings.SettingsService, project *project.ProjectService, activity *activity.ActivityService) *container.Module {return container.New(container.Dependencies{Event: event,@@ -309,10 +280,6 @@ func provideContainerRegistryModuleInternal(db *database.DB, dockerService *dockreturn registry.New(registry.Dependencies{DB: db, Docker: dockerService, KV: kvService, Settings: settingsService, SyncRemoteRegistries: environment.SyncRegistriesToRemoteEnvironments})}-func provideContainerRegistryServiceInternal(module *registry.Module) *registry.ContainerRegistryService {- return module.Service()-}-func provideProjectServiceInternal(db *database.DB, settings *settings.SettingsService, event *event.EventService, image *image.ImageService, docker *docker.DockerClientService, build *build.BuildService, lifecycleService *project.LifecycleService, kv *kv.KVService, registry *registry.ContainerRegistryService, environment *environment.EnvironmentService, cfg *config.Config) *project.ProjectService {return project.NewProjectService(db, settings, event, image, docker, build, lifecycleService, registry, cfg).WithKVService(kv).@@ -380,26 +347,14 @@ func provideJobModuleInternal(db *database.DB, settingsService *settings.Settingreturn job.New(job.Dependencies{DB: db, Settings: settingsService, Config: cfg, Environment: environment, Roles: roles, Activity: activityService})}-func provideJobServiceInternal(module *job.Module) *job.JobService {- return module.Service()-}-func provideTemplateModuleInternal(ctx context.Context, db *database.DB, httpClient *http.Client, settingsService *settings.SettingsService) *template.Module {return template.New(template.Dependencies{Context: ctx, DB: db, HTTPClient: httpClient, Settings: settingsService})}-func provideTemplateServiceInternal(module *template.Module) *template.TemplateService {- return module.Service()-}-func provideApiKeyModuleInternal(db *database.DB, userService *user.UserService, roleService *role.RoleService) *apikey.Module {return apikey.New(apikey.Dependencies{DB: db, User: userService, Role: roleService})}-func provideApiKeyServiceInternal(module *apikey.Module) *apikey.ApiKeyService {- return module.Service()-}-func provideJWKSetManagerInternal(ctx context.Context, lc fx.Lifecycle) *oidcjwk.KeySetManager {manager := oidcjwk.NewKeySetManager(ctx)lc.Append(fx.Hook{OnStop: manager.Shutdown})diff --git a/cli/internal/config/config.go b/cli/internal/config/config.goindex 71a525384..81ac1810e 100644--- a/cli/internal/config/config.go+++ b/cli/internal/config/config.go@@ -50,14 +50,10 @@ const (var customConfigPath stringvar configCache = hot.NewHotCache[string, *types.Config](hot.LRU, 4).- WithCopyOnRead(cloneConfig).- WithCopyOnWrite(cloneConfig).+ WithCopyOnRead((*types.Config).Clone).+ WithCopyOnWrite((*types.Config).Clone).Build()-func cloneConfig(cfg *types.Config) *types.Config {- return cfg.Clone()-}-func normalizeConfig(cfg *types.Config) *types.Config {if cfg == nil {return DefaultConfig()