Skip to content

feat: engine docker add more logs on stderr not stdout #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2024
Merged

feat: engine docker add more logs on stderr not stdout #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion engine/docker/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/docker/docker/pkg/jsonmessage"
"github.com/go-zoox/core-utils/cast"
"github.com/go-zoox/core-utils/strings"
"github.com/go-zoox/datetime"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

Expand All @@ -26,6 +27,9 @@ func (d *docker) create() (err error) {
d.env = append(d.env, fmt.Sprintf("%s=%s", k, v))
}

d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] prepare ...\n", datetime.Now().Format())))

d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] connect docker engine ...\n", datetime.Now().Format())))
d.client, err = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation(), func(c *client.Client) error {
if d.cfg.DockerHost != "" {
if err := client.WithHost(d.cfg.DockerHost)(c); err != nil {
Expand Down Expand Up @@ -95,8 +99,10 @@ func (d *docker) create() (err error) {
EndpointsConfig: map[string]*network.EndpointSettings{},
}
if d.cfg.Network != "" {
d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] inspect network %s ...\n", datetime.Now().Format(), d.cfg.Network)))
networkIns, err := d.client.NetworkInspect(context.Background(), d.cfg.Network, types.NetworkInspectOptions{})
if err != nil {
d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] failed to inspect network: %s\n", datetime.Now().Format(), err)))
return err
}

Expand All @@ -110,6 +116,7 @@ func (d *docker) create() (err error) {
Architecture: "amd64",
}
if d.cfg.Platform != "" {
d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] platform: %s ...\n", datetime.Now().Format(), d.cfg.Platform)))
switch d.cfg.Platform {
case "linux/amd64", "linux/arm64":
default:
Expand All @@ -121,22 +128,28 @@ func (d *docker) create() (err error) {
platformCfg.Architecture = osArch[1]
}

d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] pull image %s ...\n", datetime.Now().Format(), d.cfg.Image)))
imagePullReader, err := d.client.ImagePull(context.Background(), d.cfg.Image, types.ImagePullOptions{
Platform: d.cfg.Platform,
})
if err != nil {
d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] failed to pull image %s ...\n", datetime.Now().Format(), err)))
return err
}
defer imagePullReader.Close()

if err := jsonmessage.DisplayJSONMessagesToStream(imagePullReader, streams.NewOut(d.stdout), nil); err != nil {
if err := jsonmessage.DisplayJSONMessagesToStream(imagePullReader, streams.NewOut(d.stderr), nil); err != nil {
return err
}

d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] create container ...\n", datetime.Now().Format())))
d.container, err = d.client.ContainerCreate(context.Background(), cfg, hostCfg, networkCfg, platformCfg, d.cfg.ID)
if err != nil {
d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] failed to create container: %s\n", datetime.Now().Format(), err)))
return err
}

d.stderr.Write([]byte(fmt.Sprintf("[%s][docker] prepare done ...\n", datetime.Now().Format())))

return nil
}