Skip to content

Commit a871ed9

Browse files
committed
fix errors 1
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent a3d1e7e commit a871ed9

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

cmd/nerdctl/container/container_inspect_linux_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,16 @@ func TestContainerInspectHostConfigPID(t *testing.T) {
389389
// Run the first container
390390
base.Cmd("run", "-d", "--name", testContainer1, testutil.AlpineImage, "sleep", "infinity").AssertOK()
391391

392+
container1ID := strings.TrimSpace(base.Cmd("inspect", "-f", "{{.Id}}", testContainer1).Out())
393+
392394
// Run a container with PID namespace options
393395
base.Cmd("run", "-d", "--name", testContainer2,
394396
"--pid", fmt.Sprintf("container:%s", testContainer1),
395397
testutil.AlpineImage, "sleep", "infinity").AssertOK()
396398

397399
inspect := base.InspectContainer(testContainer2)
398400

399-
assert.Equal(t, fmt.Sprintf("container:%s", testContainer1), inspect.HostConfig.PidMode)
401+
assert.Equal(t, fmt.Sprintf("container:%s", container1ID), inspect.HostConfig.PidMode)
400402

401403
}
402404

pkg/cmd/container/create.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
224224
}
225225
internalLabels.logURI = logConfig.LogURI
226226
internalLabels.logConfig = logConfig
227+
if logConfig.Driver == "" && logConfig.Address == options.GOptions.Address {
228+
internalLabels.logConfig.Driver = "json-file"
229+
}
227230

228231
restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI, options.InRun)
229232
if err != nil {

0 commit comments

Comments
 (0)