fix(liveness): Update liveness probe to better emulate kubernetes loc…

…ally.
architect-team · Jul 12, 2022 · 33a4184 · 33a4184
1 parent 50d6044
commit 33a4184
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/common/docker-compose/index.ts b/src/common/docker-compose/index.ts
@@ -131,7 +131,7 @@ export class DockerComposeUtils {
           if (!liveness_probe.command) {
             liveness_probe.command = ['CMD-SHELL', `curl -f http://localhost:${liveness_probe.port}${liveness_probe.path} || exit 1`]; // deprecated
           } else {
-            liveness_probe.command = ['CMD-SHELL', liveness_probe.command.join(' ')];
+            liveness_probe.command = ['CMD', ...liveness_probe.command];
           }
           service.healthcheck = {
             test: liveness_probe.command,

diff --git a/test/commands/dev.test.ts b/test/commands/dev.test.ts
@@ -36,7 +36,7 @@ describe('local dev environment', function () {
             port: 3000
         environment: {}
         liveness_probe:
-          command: curl --fail localhost:3000 || exit 1
+          command: curl --fail localhost:3000
 
     interfaces:
       hello:
@@ -61,7 +61,7 @@ describe('local dev environment', function () {
             port: 3000
         environment: {}
         liveness_probe:
-          command: curl --fail localhost:3000 || exit 1
+          command: curl --fail localhost:3000
 
     interfaces:
       hello:
@@ -465,8 +465,7 @@ describe('local dev environment', function () {
         "image": "heroku/nodejs-hello-world",
         "healthcheck": {
           "test": [
-            "CMD-SHELL",
-            "curl --fail localhost:3000 || exit 1"
+            "CMD", "curl", "--fail", "localhost:3000"
           ],
           "interval": "30s",
           "timeout": "5s",
@@ -931,8 +930,7 @@ describe('local dev environment', function () {
       expect(runCompose.calledOnce).to.be.true;
       expect(compose.services['hello-world--api'].healthcheck).to.deep.equal({
         "test": [
-          "CMD-SHELL",
-          "curl --fail localhost:3000 || exit 1"
+          "CMD", "curl", "--fail", "localhost:3000"
         ],
         "interval": "30s",
         "timeout": "5s",