diff --git a/pkg/infrastructure/backend/dockerimpl/backend.go b/pkg/infrastructure/backend/dockerimpl/backend.go index bdea7d65..00a135cd 100644 --- a/pkg/infrastructure/backend/dockerimpl/backend.go +++ b/pkg/infrastructure/backend/dockerimpl/backend.go @@ -181,12 +181,12 @@ func (b *Backend) containerLabels(app *domain.Application) map[string]string { appLabel: "true", appIDLabel: app.ID, appRestartedAtLabel: app.UpdatedAt.Format(time.RFC3339Nano), - "sablier.enable": lo.Ternary(b.useSablierMiddleware(app), "true", "false"), + "sablier.enable": lo.Ternary(b.useSablier(app), "true", "false"), "sablier.group": sablierGroupName(app.ID), }) } -func (b *Backend) useSablierMiddleware(app *domain.Application) bool { +func (b *Backend) useSablier(app *domain.Application) bool { return b.config.Middleware.Sablier.Enable && app.DeployType == domain.DeployTypeRuntime && app.Config.BuildConfig.GetRuntimeConfig().AutoShutdown.Enabled diff --git a/pkg/infrastructure/backend/dockerimpl/ingress.go b/pkg/infrastructure/backend/dockerimpl/ingress.go index 74ed6319..fe981009 100644 --- a/pkg/infrastructure/backend/dockerimpl/ingress.go +++ b/pkg/infrastructure/backend/dockerimpl/ingress.go @@ -42,7 +42,7 @@ func (b *Backend) routerBase(app *domain.Application, website *domain.Website, s log.Warnf("auth config not available for %s", website.FQDN) } - if b.useSablierMiddleware(app) { + if b.useSablier(app) { middlewareName := sablierMiddlewareName(app) middlewareNames = append(middlewareNames, middlewareName) middlewares[middlewareName] = b.sablierMiddleware(app) diff --git a/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go b/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go index fa2c7a4d..3d64ea83 100644 --- a/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go +++ b/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go @@ -87,7 +87,7 @@ func (b *Backend) syncAppContainer(ctx context.Context, app *domain.RuntimeDesir RestartPolicy: container.RestartPolicy{ Name: "on-failure", // sablier stops the container, so we don't need to restart it - MaximumRetryCount: lo.Ternary(b.useSablierMiddleware(app.App), 0, 5), + MaximumRetryCount: lo.Ternary(b.useSablier(app.App), 0, 5), }, } for _, p := range app.App.PortPublications {