Skip to content

Commit 172e5b7

Browse files
committed
add: NOT running
1 parent 5678deb commit 172e5b7

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

main.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
var defaultContainerBasePath = "/var/container:/srv/container"
2020
var defaultContainerExecCommand = "docker compose -f %COMPOSE exec --user root %SERVICE /bin/sh"
21-
var defaultContainerExecCommandNotRunning = "docker compose -f %COMPOSE exec --user root %SERVICE /bin/sh"
21+
var defaultContainerExecCommandNotRunning = "docker compose -f %COMPOSE run --user root --entrypoint /bin/sh %SERVICE"
2222
var defaultMaxDepth = 2
2323

2424
//go:embed HELP.md
@@ -151,7 +151,9 @@ func getDockerServiceArray(dockerComposeYaml string) ([]string, error) {
151151
}
152152

153153
func isDockerRunning(dockerComposeYaml string, dockerService string) bool {
154-
cmd := exec.Command("docker", fmt.Sprintf("compose -f %s ps %s --format json", dockerComposeYaml, dockerService))
154+
dockerCeckCommand := fmt.Sprintf("docker compose -f %s ps %s --format json", dockerComposeYaml, dockerService)
155+
dockerCeckCommandParts := strings.Split(dockerCeckCommand, " ")
156+
cmd := exec.Command(dockerCeckCommandParts[0], dockerCeckCommandParts[1:]...)
155157

156158
var out bytes.Buffer
157159
cmd.Stdout = &out
@@ -208,7 +210,6 @@ func runDockerExec(dockerComposeYaml string, dockerService string) error {
208210

209211
var cmd *exec.Cmd
210212
if isDockerRunning(dockerComposeYaml, dockerService) {
211-
fmt.Printf("Docker container %s %s is running\n", dockerComposeYaml, dockerService)
212213
fmt.Printf("exec: %s\n", strings.Join(dockerExecCommandParts, " "))
213214
cmd = exec.Command(dockerExecCommandParts[0], dockerExecCommandParts[1:]...)
214215
} else {

0 commit comments

Comments
 (0)