Split command with '&&' correctly

Author: reteps

cmd/version.go

@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of dockerfmt",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("dockerfmt 0.3.5")
+		fmt.Println("dockerfmt 0.3.6")
 	},
 }

js/format.wasm

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/dockerfmt",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "type": "module",
   "description": "",
   "repository": "git+https://github.com/reteps/dockerfmt/tree/main/js",
@@ -31,7 +31,7 @@
   "scripts": {
     "//": "Requires tinygo 0.38.0 or later",
     "build": "npm run build-go && npm run build-js",
-    "build-go": "tinygo build -o format.wasm -target wasm --no-debug -scheduler=none",
+    "build-go": "tinygo build -o format.wasm -target wasm --no-debug",
     "build-js": "tsc && cp format.wasm wasm_exec.js dist",
     "format": "prettier --write \"**/*.{js,ts,json}\""
   },

js/package.json

@@ -458,39 +458,26 @@ func getCmd(n *ExtendedNode, shouldSplitNode bool) []string {
 	return cmd
 }
 
-func formatEntrypoint(n *ExtendedNode, c *Config) string {
-	// this can technically change behavior. https://docs.docker.com/reference/dockerfile/#understand-how-cmd-and-entrypoint-interact
-	isJSON, ok := n.Node.Attributes["json"]
-	if !ok {
-		isJSON = false
+func shouldRunInShell(node string) bool {
+	// https://docs.docker.com/reference/dockerfile/#entrypoint
+	parts, err := shlex.Split(node)
+	if err != nil {
+		log.Fatalf("Error splitting: %s\n", node)
 	}
-	if !isJSON {
-		// https://docs.docker.com/reference/dockerfile/#entrypoint
-		node := n.Next.Node.Value
-		parts, err := shlex.Split(node)
-		if err != nil {
-			log.Fatalf("Error splitting: %s\n", node)
-		}
 
-		doNotSplit := false
-		// This is a simplistic check to determine if we need to run in a full shell.
-		for _, part := range parts {
-			if part == "&&" || part == ";" || part == "||" {
-				doNotSplit = true
-				break
-			}
-		}
-
-		if doNotSplit {
-			n.Next.Node.Flags = append(n.Next.Node.Flags, []string{"/bin/sh", "-c"}...)
-			// Hacky workaround to tell getCmd to not split the command
-			if n.Node.Attributes == nil {
-				n.Node.Attributes = make(map[string]bool)
-			}
-			n.Node.Attributes["json"] = true
+	needsShell := false
+	// This is a simplistic check to determine if we need to run in a full shell.
+	for _, part := range parts {
+		if part == "&&" || part == ";" || part == "||" {
+			needsShell = true
+			break
 		}
 	}
-	// printAST(n, 0)
+
+	return needsShell
+}
+func formatEntrypoint(n *ExtendedNode, c *Config) string {
+	// this can technically change behavior. https://docs.docker.com/reference/dockerfile/#understand-how-cmd-and-entrypoint-interact
 	return formatCmd(n, c)
 }
 func formatCmd(n *ExtendedNode, c *Config) string {
@@ -499,6 +486,16 @@ func formatCmd(n *ExtendedNode, c *Config) string {
 	if !ok {
 		isJSON = false
 	}
+
+	if !isJSON {
+		doNotSplit := shouldRunInShell(n.Node.Next.Value)
+		if doNotSplit {
+			n.Next.Node.Flags = append(n.Next.Node.Flags, []string{"/bin/sh", "-c"}...)
+			// Hacky workaround to tell getCmd to not split the command
+			isJSON = true
+		}
+	}
+
 	cmd := getCmd(n.Next, !isJSON)
 	b, err := Marshal(cmd)
 	if err != nil {

lib/format.go

@@ -0,0 +1,7 @@
+FROM nginx
+WORKDIR /app
+ARG PROJECT_DIR=/
+ARG NGINX_CONF=nginx.conf
+COPY $NGINX_CONF /etc/nginx/conf.d/nginx.conf
+COPY $PROJECT_DIR /app
+CMD mkdir --parents /var/log/nginx && nginx -g "daemon off;"

tests/in/crash.dockerfile

@@ -0,0 +1,7 @@
+FROM nginx
+WORKDIR /app
+ARG PROJECT_DIR=/
+ARG NGINX_CONF=nginx.conf
+COPY $NGINX_CONF /etc/nginx/conf.d/nginx.conf
+COPY $PROJECT_DIR /app
+CMD ["/bin/sh", "-c", "mkdir --parents /var/log/nginx && nginx -g \"daemon off;\""]