align compose ps output with docker ps
#10065
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ndeloof
force-pushed
the
align_ps_docker_cli
branch
3 times, most recently
from
adbd655
to
1c59aa9
Compare
ndeloof
changed the title
compose ps output with docker pscompose ps output with docker ps
ndeloof
force-pushed
the
align_ps_docker_cli
branch
9 times, most recently
from
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. |
ndeloof
force-pushed
the
align_ps_docker_cli
branch
from
2f89b88
to
8bfac9f
Compare
ndeloof
force-pushed
the
align_ps_docker_cli
branch
from
8bfac9f
to
aa08375
Compare
ndeloof
force-pushed
the
align_ps_docker_cli
branch
from
aa08375
to
ad9cc19
Compare
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
ndeloof
force-pushed
the
align_ps_docker_cli
branch
from
ad9cc19
to
902b7cd
Compare
milas
approved these changes
Dec 13, 2022
| @@ -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.
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.
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.
Hurray for backwards compatibility 🎉
LeSuisse
pushed a commit
to Enalean/tuleap
that referenced
this pull request
Dec 28, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Align
docker compose psoutput withdocker psfor 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
