fix: no retry for auto shutdown apps

traPtitech · Jan 8, 2025 · 0e69d85 · 0e69d85
1 parent 504b2d2
commit 0e69d85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/infrastructure/backend/dockerimpl/config.go b/pkg/infrastructure/backend/dockerimpl/config.go
@@ -87,7 +87,6 @@ type Config struct {
 	// Middleware section defines middleware settings.
 	Middleware struct {
 		// Sablier (https://github.com/acouvreur/sablier) starts user apps on demand and shuts them down after a certain time.
-		// Apps which enable auto shutdown should be able to handle SIGTERM signal.
 		Sablier struct {
 			Enable     bool   `mapstructure:"enable" yaml:"enable"`
 			SablierURL string `mapstructure:"url" yaml:"url"`

diff --git a/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go b/pkg/infrastructure/backend/dockerimpl/synchronize_runtime.go
@@ -85,8 +85,9 @@ func (b *Backend) syncAppContainer(ctx context.Context, app *domain.RuntimeDesir
 	hostConfig := &container.HostConfig{
 		PortBindings: make(map[nat.Port][]nat.PortBinding),
 		RestartPolicy: container.RestartPolicy{
-			Name:              "on-failure",
-			MaximumRetryCount: 5,
+			Name: "on-failure",
+			// sablier stops the container, so we don't need to restart it
+			MaximumRetryCount: lo.Ternary(b.useSablierMiddleware(app.App), 0, 5),
 		},
 	}
 	for _, p := range app.App.PortPublications {