Skip to content

Commit 061b6e4

Browse files
caoxianfei1Wine93
authored andcommitted
bugfix: docker ps specify both --format and --quiet will warning since v24.0.0.
WARNING: Ignoring custom format, because both --format and --quiet are set. Signed-off-by: caoxianfei1 <[email protected]>
1 parent bc5ef37 commit 061b6e4

File tree

15 files changed

+0
-15
lines changed

15 files changed

+0
-15
lines changed

internal/task/task/bs/add_target.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func NewAddTargetTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task
6767
t.AddStep(&step.ListContainers{
6868
ShowAll: true,
6969
Format: "'{{.ID}} {{.Status}}'",
70-
Quiet: true,
7170
Filter: fmt.Sprintf("name=%s", DEFAULT_TGTD_CONTAINER_NAME),
7271
Out: &output,
7372
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/create_volume.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ func NewCreateVolumeTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*t
8787
t.AddStep(&step.ListContainers{
8888
ShowAll: true,
8989
Format: "'{{.Status}}'",
90-
Quiet: true,
9190
Filter: fmt.Sprintf("name=%s", containerName),
9291
Out: &out,
9392
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/delete_target.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func NewDeleteTargetTask(curveadm *cli.CurveAdm, cc *client.ClientConfig) (*task
6767
t.AddStep(&step.ListContainers{
6868
ShowAll: true,
6969
Format: "'{{.ID}} {{.Status}}'",
70-
Quiet: true,
7170
Filter: fmt.Sprintf("name=%s", DEFAULT_TGTD_CONTAINER_NAME),
7271
Out: &output,
7372
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/format.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ func NewFormatChunkfilePoolTask(curveadm *cli.CurveAdm, fc *configure.FormatConf
252252
t.AddStep(&step.ListContainers{
253253
ShowAll: true,
254254
Format: "'{{.ID}}'",
255-
Quiet: true,
256255
Filter: fmt.Sprintf("name=%s", containerName),
257256
Out: &oldContainerId,
258257
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/format_stop.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func NewStopFormatTask(curveadm *cli.CurveAdm, fc *configure.FormatConfig) (*tas
105105
t.AddStep(&step.ListContainers{
106106
ShowAll: true,
107107
Format: "'{{.ID}}'",
108-
Quiet: true,
109108
Filter: fmt.Sprintf("name=%s", containerName),
110109
Out: &oldContainerId,
111110
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/list_targets.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ func NewListTargetsTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task, erro
120120
t.AddStep(&step.ListContainers{
121121
ShowAll: true,
122122
Format: "'{{.ID}} {{.Status}}'",
123-
Quiet: true,
124123
Filter: fmt.Sprintf("name=%s", DEFAULT_TGTD_CONTAINER_NAME),
125124
Out: &output,
126125
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/map.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ func NewMapTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.Task,
9494
t.AddStep(&step.ListContainers{
9595
ShowAll: true,
9696
Format: "'{{.Status}}'",
97-
Quiet: true,
9897
Filter: fmt.Sprintf("name=%s", containerName),
9998
Out: &out,
10099
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/start_nebd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ func NewStartNEBDServiceTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig)
167167
t.AddStep(&step.ListContainers{
168168
ShowAll: true,
169169
Format: "'{{.ID}}'",
170-
Quiet: true,
171170
Filter: fmt.Sprintf("name=%s", containerName),
172171
Out: &containerId,
173172
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/start_tgtd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ func NewStartTargetDaemonTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig
7777
t.AddStep(&step.ListContainers{
7878
ShowAll: true,
7979
Format: "'{{.Status}}'",
80-
Quiet: true,
8180
Filter: fmt.Sprintf("name=%s", DEFAULT_TGTD_CONTAINER_NAME),
8281
Out: &status,
8382
ExecOptions: curveadm.ExecOptions(),

internal/task/task/bs/stop_tgtd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func NewStopTargetDaemonTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task,
5757
t.AddStep(&step.ListContainers{
5858
ShowAll: true,
5959
Format: "'{{.ID}}'",
60-
Quiet: true,
6160
Filter: fmt.Sprintf("name=%s", DEFAULT_TGTD_CONTAINER_NAME),
6261
Out: &containerId,
6362
ExecOptions: curveadm.ExecOptions(),

0 commit comments

Comments
 (0)