Merge branch 'main' into fix/health-check-cmd-prefix

Author: firecow

examples/swarm-app.yml

@@ -62,11 +62,11 @@ service_specs:
           publish_mode: ingress
     health_check:
       test: ["CMD", "true"]
-      interval: 5000000 # 5s
-      timeout: 5000000 # 5s
+      interval: 5000000000 # 5s (nanoseconds)
+      timeout: 5000000000 # 5s (nanoseconds)
       retries: 3
-      start_period: 5000000 # 5s
-      start_interval: 1000000 # 1s
+      start_period: 5000000000 # 5s (nanoseconds)
+      start_interval: 1000000000 # 1s (nanoseconds)
     mounts:
       /etc/nginx/:
         source: "web-data"

schema.json

@@ -75,7 +75,7 @@
             ]
           },
           "stop_grace_period": {
-            "type": "int32"
+            "type": "float64"
           },
           "user": {
             "type": "string"
@@ -107,10 +107,10 @@
                 "elements": {
                   "properties": {
                     "published_port": {
-                      "type": "int16"
+                      "type": "uint16"
                     },
                     "target_port": {
-                      "type": "int16"
+                      "type": "uint16"
                     }
                   },
                   "optionalProperties": {
@@ -140,19 +140,19 @@
                 }
               },
               "interval": {
-                "type": "int32"
+                "type": "float64"
               },
               "timeout": {
-                "type": "int32"
+                "type": "float64"
               },
               "retries": {
                 "type": "int32"
               },
               "start_period": {
-                "type": "int32"
+                "type": "float64"
               },
               "start_interval": {
-                "type": "int32"
+                "type": "float64"
               }
             }
           },

src/swarm-app-config.ts

@@ -104,7 +104,7 @@ export const swarmAppConfigSchema: JTDSchemaType<SwarmAppConfig> = {
                     },
                     replicas: {type: "int32"},
                     stop_signal: {enum: ["SIGTERM", "SIGQUIT"]},
-                    stop_grace_period: {type: "int32"},
+                    stop_grace_period: {type: "float64"},
                     user: {type: "string"},
                     placement: {
                         optionalProperties: {
@@ -124,8 +124,8 @@ export const swarmAppConfigSchema: JTDSchemaType<SwarmAppConfig> = {
                             ports: {
                                 elements: {
                                     properties: {
-                                        published_port: {type: "int16"},
-                                        target_port: {type: "int16"},
+                                        published_port: {type: "uint16"},
+                                        target_port: {type: "uint16"},
                                     },
                                     optionalProperties: {
                                         publish_mode: {enum: ["ingress", "host"]},
@@ -138,11 +138,11 @@ export const swarmAppConfigSchema: JTDSchemaType<SwarmAppConfig> = {
                     health_check: {
                         optionalProperties: {
                             test: {elements: {type: "string"}},
-                            interval: {type: "int32"},
-                            timeout: {type: "int32"},
+                            interval: {type: "float64"},
+                            timeout: {type: "float64"},
                             retries: {type: "int32"},
-                            start_period: {type: "int32"},
-                            start_interval: {type: "int32"},
+                            start_period: {type: "float64"},
+                            start_interval: {type: "float64"},
                         },
                     },
                     dir: {type: "string"},