Skip to content

Commit

Permalink
fix: remove misleading docker run print in debug mode
Browse files Browse the repository at this point in the history
  • Loading branch information
jyecusch committed May 19, 2023
1 parent 93bcff2 commit 708df10
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 60 deletions.
5 changes: 0 additions & 5 deletions pkg/codeconfig/codeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
multierror "github.com/missionMeteora/toolkit/errors"
"github.com/moby/moby/pkg/stdcopy"
"github.com/pkg/errors"
"github.com/pterm/pterm"
"google.golang.org/grpc"

"github.com/nitrictech/cli/pkg/containerengine"
Expand Down Expand Up @@ -494,10 +493,6 @@ func (c *codeConfig) collectOne(handler string) error {
Env: env,
}

if output.VerboseLevel > 2 {
pterm.Debug.Println(containerengine.Cli(cc, hostConfig))
}

cn := strings.Join([]string{c.initialProject.Name, "codeAsConfig", rt.ContainerName()}, "-")

cID, err := ce.ContainerCreate(cc, hostConfig, &network.NetworkingConfig{
Expand Down
51 changes: 0 additions & 51 deletions pkg/containerengine/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package containerengine
import (
"errors"
"io"
"strings"
"time"

"github.com/docker/docker/api/types"
Expand Down Expand Up @@ -71,53 +70,3 @@ func Discover() (ContainerEngine, error) {

return nil, errors.New("Nitric relies on Docker to be running before containerizing your project. Please refer to our installation instructions - https://nitric.io/docs/installation")
}

func Cli(cc *container.Config, hc *container.HostConfig) string {
cmd := []string{"docker", "run"}

if cc.Tty {
cmd = append(cmd, "-t")
}

if len(cc.Entrypoint) > 0 {
cmd = append(cmd, "--entrypoint")
cmd = append(cmd, cc.Entrypoint...)
}

if cc.WorkingDir != "" {
cmd = append(cmd, "-w", cc.WorkingDir)
}

for _, v := range hc.Mounts {
cmd = append(cmd, "-v", v.Source+":"+v.Target)
}

for _, e := range cc.Env {
cmd = append(cmd, "-e", e)
}

for _, h := range hc.ExtraHosts {
cmd = append(cmd, "--add-host", h)
}

if hc.AutoRemove {
cmd = append(cmd, "--rm")
}

if cc.AttachStdout {
cmd = append(cmd, "-a", "stdout")
}

if cc.AttachStdin {
cmd = append(cmd, "-a", "stdin")
}

if cc.AttachStderr {
cmd = append(cmd, "-a", "stderr")
}

cmd = append(cmd, cc.Image)
cmd = append(cmd, cc.Cmd...)

return strings.Join(cmd, " ")
}
4 changes: 0 additions & 4 deletions pkg/run/function.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"time"

"github.com/docker/docker/api/types/container"
"github.com/pterm/pterm"

"github.com/nitrictech/cli/pkg/containerengine"
"github.com/nitrictech/cli/pkg/project"
"github.com/nitrictech/cli/pkg/runtime"
Expand Down Expand Up @@ -74,8 +72,6 @@ func (f *Function) Start(envMap map[string]string) error {
Env: env,
}

pterm.Debug.Print(containerengine.Cli(cc, hc))

cID, err := f.ce.ContainerCreate(cc, hc, nil, strings.Join([]string{f.projectName, "run", f.Name()}, "-"))
if err != nil {
return err
Expand Down

0 comments on commit 708df10

Please sign in to comment.