-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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.
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
align compose ps
output with docker ps
#10065
Conversation
adbd655
to
1c59aa9
Compare
compose ps
output with docker ps
compose ps
output with docker ps
45136ba
to
2f89b88
Compare
Codecov ReportBase: 77.02% // Head: 76.98% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## v2 #10065 +/- ##
==========================================
- Coverage 77.02% 76.98% -0.04%
==========================================
Files 2 2
Lines 235 252 +17
==========================================
+ Hits 181 194 +13
- Misses 48 51 +3
- Partials 6 7 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
2f89b88
to
8bfac9f
Compare
8bfac9f
to
aa08375
Compare
aa08375
to
ad9cc19
Compare
Signed-off-by: Nicolas De Loof <[email protected]>
Signed-off-by: Nicolas De Loof <[email protected]>
ad9cc19
to
902b7cd
Compare
@@ -142,21 +144,18 @@ SERVICES: | |||
|
|||
return formatter.Print(containers, opts.Format, os.Stdout, | |||
writer(containers), | |||
"NAME", "COMMAND", "SERVICE", "STATUS", "PORTS") | |||
"NAME", "IMAGE", "COMMAND", "SERVICE", "CREATED", "STATUS", "PORTS") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think it would be weird to show the value/path from dockerfile
for services that Compose built (instead of the auto-generated image name)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure. We would get this path from the current compose file, so this would only work when ran with a --file
but not with --project-name
, and even with this would assume the current compose file is in sync with listed containers.
@@ -30,7 +30,7 @@ import ( | |||
// Print prints formatted lists in different formats | |||
func Print(toJSON interface{}, format string, outWriter io.Writer, writerFn func(w io.Writer), headers ...string) error { | |||
switch strings.ToLower(format) { | |||
case PRETTY, "": | |||
case TABLE, PRETTY, "": |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hurray for backwards compatibility 🎉
The following command should not raise any error: make psalm FILES=plugins/onlyoffice/include/DocumentServer/DocumentServerDao.php Introduced in 9f9e629 This also fix CI tests that are failing under [docker compose 2.14.2][0]. Probably linked to the [change of docker compose ps][0]. We should probably switch our dev environment to the same version of the CI (we are using 2.14.0), however using directly `docker compose cp tests:…` instead of `docker cp $(docker compose ps tests):…` seems to be good enough. No functional change. [0]: https://docs.docker.com/compose/release-notes/#2142 [1]: docker/compose#10065 Part of story #29981: restrict an OnlyOffice server to some projects only Change-Id: I31c84d55fdcfea4975ac5d592576c9846e1d0e49
What I did
Align
docker compose ps
output withdocker ps
for an homogeneous user experience.Ideally, would share code with docker/cli, maybe something to be considered for a future PR :P
example:
Related issue
fixes #6867
(not mandatory) A picture of a cute animal, if possible in relation to what you did