Disable oom killer completely

.gitea/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
   deploy-production:
     runs-on: [amd64, prod]
     env:
-      NODES: node-22.rosti.cz node-23.rosti.cz node-24.rosti.cz node-25.rosti.cz
+      NODES: node-22.rosti.cz node-23.rosti.cz node-24.rosti.cz node-25.rosti.cz node-28.rosti.cz node-29.rosti.cz
     steps:
     - uses: actions/checkout@v4
     - name: deploy

.gitea/workflows/unittests.yml

@@ -7,7 +7,7 @@ on:
   
 jobs:
   unittests:
-    runs-on: [amd64, moon]
+    runs-on: [amd64, dev]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v3
@@ -36,11 +36,14 @@ jobs:
     #     - 9001:9001
     #     options: server /data --console-address :9001
   deploy-dev:
-    runs-on: [amd64, moon]
+    runs-on: [amd64, dev]
     env:
-      NODES: "192.168.1.33"
+      NODES: "192.168.1.199"
     steps:
     - uses: actions/checkout@v4
+    - uses: webfactory/ssh-agent@v0.9.0
+      with:
+        ssh-private-key: ${{ secrets.SSH_MASTER_KEY }}
     - name: deploy
       run: |
         # echo LS1

containers/docker.go

@@ -338,10 +338,13 @@ func (d *Driver) Create(name string, image string, volumePath string, HTTPPort i
 		}
 	}
 
-	OOMKillDisable := false
-	if memory < 1500 {
-		OOMKillDisable = true
-	}
+	// OOMKillDisable := false
+	// if memory < 1500 {
+	// 	OOMKillDisable = true
+	// }
+	// We disable OOM killer because it keeps containers in resource heavy loop
+	// This is from some discussion: If OOM-killer is disabled, tasks under cgroup will hang/sleep in memory cgroup's OOM-waitqueue when they request accountable memory
+	OOMKillDisable := true
 
 	envList := []string{}
 	for key, value := range env {

containers/types.go

@@ -563,9 +563,16 @@ func (c *Container) GetPrimaryTech() (apps.AppTech, error) {
 		parts := strings.Split(string(*stdouterr), "/")
 		if len(parts) == 5 {
 			rawTech := parts[3]
+			if rawTech == "default" {
+				return apps.AppTech{
+					Name:    "default",
+					Version: "",
+				}, nil
+			}
+
 			techParts := strings.Split(rawTech, "-")
 			if len(techParts) != 2 {
-				return tech, errors.New("wrong number of tech parts")
+				return tech, errors.New("wrong number of tech parts (" + rawTech + ")")
 			}
 			return apps.AppTech{
 				Name:    techParts[0],

glue/main.go

@@ -100,6 +100,9 @@ func (p *Processor) waitForApp() error {
 			return err
 		}
 		if status.Status == "running" {
+			if i > 0 {
+				time.Sleep(sleepFor) // We wait a little bit more to make sure the container is fully started
+			}
 			return nil
 		}
 

handlers.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -236,7 +235,7 @@ func clearPasswordHandler(c echo.Context) error {
 func setKeysHandler(c echo.Context) error {
 	name := c.Param("name")
 
-	body, err := ioutil.ReadAll(c.Request().Body)
+	body, err := io.ReadAll(c.Request().Body)
 	if err != nil {
 		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
 	}
@@ -495,3 +494,119 @@ func metricsHandler(c echo.Context) error {
 
 	return c.String(http.StatusOK, metrics)
 }
+
+func CreateSnapshotHandler(c echo.Context) error {
+	name := c.Param("name")
+
+	body := createSnapshotBody{}
+	err := c.Bind(body)
+	if err != nil {
+		return c.JSONPretty(http.StatusBadRequest, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	processor := glue.Processor{
+		AppName:           name,
+		DB:                common.GetDBConnection(),
+		SnapshotProcessor: &snapshotProcessor,
+		DockerSock:        config.DockerSocket,
+		BindIPHTTP:        config.AppsBindIPHTTP,
+		BindIPSSH:         config.AppsBindIPSSH,
+		AppsPath:          config.AppsPath,
+	}
+
+	err = processor.CreateSnapshot(body.Labels)
+	if err != nil {
+		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	return c.JSONPretty(http.StatusOK, Message{Message: "ok"}, JSONIndent)
+}
+
+func RestoreFromSnapshotHandler(c echo.Context) error {
+	name := c.Param("name")
+	snapshot := c.Param("snapshot")
+
+	processor := glue.Processor{
+		AppName:           name,
+		DB:                common.GetDBConnection(),
+		SnapshotProcessor: &snapshotProcessor,
+		DockerSock:        config.DockerSocket,
+		BindIPHTTP:        config.AppsBindIPHTTP,
+		BindIPSSH:         config.AppsBindIPSSH,
+		AppsPath:          config.AppsPath,
+	}
+
+	err := processor.RestoreFromSnapshot(snapshot)
+	if err != nil {
+		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	return c.JSONPretty(http.StatusOK, Message{Message: "ok"}, JSONIndent)
+}
+
+func ListSnapshotsHandler(c echo.Context) error {
+	name := c.Param("name")
+
+	processor := glue.Processor{
+		AppName:           name,
+		DB:                common.GetDBConnection(),
+		SnapshotProcessor: &snapshotProcessor,
+		DockerSock:        config.DockerSocket,
+		BindIPHTTP:        config.AppsBindIPHTTP,
+		BindIPSSH:         config.AppsBindIPSSH,
+		AppsPath:          config.AppsPath,
+	}
+
+	snapshots, err := processor.ListSnapshots()
+	if err != nil {
+		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	return c.JSON(http.StatusOK, snapshots)
+}
+
+func ListAppsSnapshotsHandler(c echo.Context) error {
+	name := c.Param("name")
+	apps := []string{}
+
+	err := c.Bind(&apps)
+	if err != nil {
+		return c.JSONPretty(http.StatusBadRequest, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	processor := glue.Processor{
+		AppName:           name,
+		DB:                common.GetDBConnection(),
+		SnapshotProcessor: &snapshotProcessor,
+		DockerSock:        config.DockerSocket,
+		BindIPHTTP:        config.AppsBindIPHTTP,
+		BindIPSSH:         config.AppsBindIPSSH,
+		AppsPath:          config.AppsPath,
+	}
+	snapshots, err := processor.ListAppsSnapshots(apps)
+	if err != nil {
+		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	return c.JSON(http.StatusOK, snapshots)
+}
+
+func ListSnapshotsByLabelHandler(c echo.Context) error {
+	label := c.Param("label")
+
+	processor := glue.Processor{
+		AppName:           "",
+		DB:                common.GetDBConnection(),
+		SnapshotProcessor: &snapshotProcessor,
+		DockerSock:        config.DockerSocket,
+		BindIPHTTP:        config.AppsBindIPHTTP,
+		BindIPSSH:         config.AppsBindIPSSH,
+		AppsPath:          config.AppsPath,
+	}
+	snapshots, err := processor.ListSnapshotsByLabel(label)
+	if err != nil {
+		return c.JSONPretty(http.StatusInternalServerError, Message{Message: err.Error()}, JSONIndent)
+	}
+
+	return c.JSON(http.StatusOK, snapshots)
+}

main.go

@@ -198,6 +198,13 @@ func main() {
 	// Delete one app
 	e.DELETE("/v1/apps/:name", deleteAppHandler)
 
+	// Snapshots
+	e.POST("/v1/apps/:name/snapshots", CreateSnapshotHandler)
+	e.POST("/v1/apps/:name/snapshots/restore/:snapshot", RestoreFromSnapshotHandler)
+	e.GET("/v1/apps/:name/snapshots", ListSnapshotsHandler)
+	e.GET("/v1/snapshots", ListAppsSnapshotsHandler)
+	e.GET("/v1/snapshots/by-label", ListSnapshotsByLabelHandler)
+
 	// Orphans returns directories in /srv that doesn't match any hosted application
 	e.GET("/v1/orphans", getOrphansHander)
 

types.go

@@ -56,6 +56,7 @@ type QuickServices struct {
 	PHP       bool `json:"php"`
 	Ruby      bool `json:"ruby"`
 	Deno      bool `json:"deno"`
+	Bun      bool `json:"bun"`
 	Memcached bool `json:"memcached"`
 	Redis     bool `json:"redis"`
 }
@@ -65,3 +66,7 @@ type Technology struct {
 	Name    string
 	Version string
 }
+
+type createSnapshotBody struct {
+	Labels []string `json:"labels"`
+}