clean up CMDs

fly-apps · Aug 11, 2023 · 9f0010b · 9f0010b
1 parent 1eb1230
commit 9f0010b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/gdf.js b/gdf.js
@@ -515,7 +515,7 @@ export class GDF {
 
   // command to start the web server
   get startCommand() {
-    if (this.options.cmd) return JSON.stringify(this.options.cmd)
+    if (this.options.cmd) return this.options.cmd
 
     if (this.options.distroless) {
       const start = this.#pj.scripts.start

diff --git a/templates/Dockerfile.ejs b/templates/Dockerfile.ejs
@@ -218,6 +218,8 @@ EXPOSE <%= port %>
 <% } -%>
 <% if (foreman) { -%>
 CMD [ "<%= packager === "bun" ? 'bunx' : 'npx' %>", "foreman", "start", "--procfile", "Procfile.prod" ]
-<% } else { -%>
+<% } else if (Array.isArray(startCommand)) { -%>
 CMD <%- JSON.stringify(startCommand, null, 1).replaceAll(/\n\s*/g, " ") %>
+<% } else { -%>
+CMD <%- startCommand %>
 <% } -%>
diff --git a/test/base/cmd-entrypoint/Dockerfile b/test/base/cmd-entrypoint/Dockerfile
@@ -39,4 +39,4 @@ ENTRYPOINT "node"
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
-CMD "\"./bin/www\""
+CMD ./bin/www