Merge branch 'master' of github.com:kool-dev/kool

Author: fabriciojs

README.md

@@ -81,16 +81,29 @@ Execute command in running container.
 ### kool run
 
 ```bash
-$ kool run [script/image] [command]
+$ kool run [script] [command]
 ```
 
 Execute script or a docker image.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| `script/image` | `string` | Script to run within your `kool.yaml` file.|
+| `script` | `string` | Script to run within your `kool.yaml` file. |
 | `command` | `string` | The command to run, i.e: `composer install`, `yarn install` |
-| `--docker` | `none` | If enabled, `script` param will become `image` and you will run a docker image |
+
+### kool docker
+
+```bash
+$ kool docker [image] [command]
+```
+
+Execute script or a docker image.
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| `image` | `string` | Docker image to run, i.e: `fireworkweb/node:14` |
+| `command` | `string` | The command to run, i.e: `composer install`, `yarn install` |
+| `--disable-tty|-T` | `none` | Force disable tty, good for CI/CI/Automation |
 
 ### kool stop
 

cmd/docker.go

@@ -25,7 +25,7 @@ var dockerFlags = &DockerFlags{false}
 func init() {
 	rootCmd.AddCommand(dockerCmd)
 
-	dockerCmd.Flags().BoolVarP(&dockerFlags.DisableTty, "disable-tty", "T", false, "Disables TTY (only in case of using --docker)")
+	dockerCmd.Flags().BoolVarP(&dockerFlags.DisableTty, "disable-tty", "T", false, "Disables TTY")
 }
 
 func runDocker(cmd *cobra.Command, originalArgs []string) {

cmd/presets.go

@@ -125,7 +125,7 @@ APP_URL=http://localhost:${PORT}`,
 
   install:
     - cp .env.example .env
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 	presets["adonis"] = map[string]string{
@@ -197,7 +197,7 @@ APP_URL=http://localhost:${PORT}`,
 
   install:
     - cp .env.example .env
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 	presets["laravel"] = map[string]string{
@@ -263,8 +263,8 @@ networks:
   php: kool exec app php
   composer: kool exec app composer
 
-  node: kool run --docker fireworkweb/node:14 node
-  npm: kool run --docker fireworkweb/node:14 npm # can change to: yarn,pnpm
+  node: kool docker fireworkweb/node:14 node
+  npm: kool docker fireworkweb/node:14 npm # can change to: yarn,pnpm
 
   install:
     - kool start
@@ -319,7 +319,7 @@ networks:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 	presets["nextjs"] = map[string]string{
@@ -359,7 +359,7 @@ networks:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 	presets["nuxtjs-static"] = map[string]string{
@@ -406,7 +406,7 @@ networks:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 	presets["nuxtjs"] = map[string]string{
@@ -451,7 +451,7 @@ networks:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start`,
 	}
 }

presets/adonis-nextjs/kool.yml

@@ -5,5 +5,5 @@ scripts:
 
   install:
     - cp .env.example .env
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start

presets/adonis/kool.yml

@@ -5,5 +5,5 @@ scripts:
 
   install:
     - cp .env.example .env
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start

presets/laravel/kool.yml

@@ -2,8 +2,8 @@ scripts:
   php: kool exec app php
   composer: kool exec app composer
 
-  node: kool run --docker fireworkweb/node:14 node
-  npm: kool run --docker fireworkweb/node:14 npm # can change to: yarn,pnpm
+  node: kool docker fireworkweb/node:14 node
+  npm: kool docker fireworkweb/node:14 npm # can change to: yarn,pnpm
 
   install:
     - kool start

presets/nextjs-static/kool.yml

@@ -3,5 +3,5 @@ scripts:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start

presets/nextjs/kool.yml

@@ -3,5 +3,5 @@ scripts:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start

presets/nuxtjs-static/kool.yml

@@ -3,5 +3,5 @@ scripts:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start

presets/nuxtjs/kool.yml

@@ -3,5 +3,5 @@ scripts:
   npm: kool exec app npm # can change to: yarn,pnpm
 
   install:
-    - kool run --docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
+    - kool docker fireworkweb/node:14 npm install # can change to: yarn,pnpm
     - kool start