-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
docs: update example redis tags from 3.0.x to 7.4.x #5595
Merged
+72
−72
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,35 +36,35 @@ The following command shows all the tasks that are part of the `redis` service: | |
$ docker service ps redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
0qihejybwf1x redis.1 redis:3.0.5 manager1 Running Running 8 seconds | ||
bk658fpbex0d redis.2 redis:3.0.5 worker2 Running Running 9 seconds | ||
5ls5s5fldaqg redis.3 redis:3.0.5 worker1 Running Running 9 seconds | ||
8ryt076polmc redis.4 redis:3.0.5 worker1 Running Running 9 seconds | ||
1x0v8yomsncd redis.5 redis:3.0.5 manager1 Running Running 8 seconds | ||
71v7je3el7rr redis.6 redis:3.0.5 worker2 Running Running 9 seconds | ||
4l3zm9b7tfr7 redis.7 redis:3.0.5 worker2 Running Running 9 seconds | ||
9tfpyixiy2i7 redis.8 redis:3.0.5 worker1 Running Running 9 seconds | ||
3w1wu13yupln redis.9 redis:3.0.5 manager1 Running Running 8 seconds | ||
8eaxrb2fqpbn redis.10 redis:3.0.5 manager1 Running Running 8 seconds | ||
0qihejybwf1x redis.1 redis:7.4.0 manager1 Running Running 8 seconds | ||
bk658fpbex0d redis.2 redis:7.4.0 worker2 Running Running 9 seconds | ||
5ls5s5fldaqg redis.3 redis:7.4.0 worker1 Running Running 9 seconds | ||
8ryt076polmc redis.4 redis:7.4.0 worker1 Running Running 9 seconds | ||
1x0v8yomsncd redis.5 redis:7.4.0 manager1 Running Running 8 seconds | ||
71v7je3el7rr redis.6 redis:7.4.0 worker2 Running Running 9 seconds | ||
4l3zm9b7tfr7 redis.7 redis:7.4.0 worker2 Running Running 9 seconds | ||
9tfpyixiy2i7 redis.8 redis:7.4.0 worker1 Running Running 9 seconds | ||
3w1wu13yupln redis.9 redis:7.4.0 manager1 Running Running 8 seconds | ||
8eaxrb2fqpbn redis.10 redis:7.4.0 manager1 Running Running 8 seconds | ||
``` | ||
|
||
In addition to running tasks, the output also shows the task history. For | ||
example, after updating the service to use the `redis:3.0.6` image, the output | ||
example, after updating the service to use the `redis:7.4.1` image, the output | ||
may look like this: | ||
|
||
```console | ||
$ docker service ps redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
50qe8lfnxaxk redis.1 redis:3.0.6 manager1 Running Running 6 seconds ago | ||
ky2re9oz86r9 \_ redis.1 redis:3.0.5 manager1 Shutdown Shutdown 8 seconds ago | ||
3s46te2nzl4i redis.2 redis:3.0.6 worker2 Running Running less than a second ago | ||
nvjljf7rmor4 \_ redis.2 redis:3.0.6 worker2 Shutdown Rejected 23 seconds ago "No such image: redis@sha256:6…" | ||
vtiuz2fpc0yb \_ redis.2 redis:3.0.5 worker2 Shutdown Shutdown 1 second ago | ||
jnarweeha8x4 redis.3 redis:3.0.6 worker1 Running Running 3 seconds ago | ||
vs448yca2nz4 \_ redis.3 redis:3.0.5 worker1 Shutdown Shutdown 4 seconds ago | ||
jf1i992619ir redis.4 redis:3.0.6 worker1 Running Running 10 seconds ago | ||
blkttv7zs8ee \_ redis.4 redis:3.0.5 worker1 Shutdown Shutdown 11 seconds ago | ||
50qe8lfnxaxk redis.1 redis:7.4.1 manager1 Running Running 6 seconds ago | ||
ky2re9oz86r9 \_ redis.1 redis:7.4.0 manager1 Shutdown Shutdown 8 seconds ago | ||
Comment on lines
+59
to
+60
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess for this one, we'd then have to change to 7.3 -> 7.4 🤔 |
||
3s46te2nzl4i redis.2 redis:7.4.1 worker2 Running Running less than a second ago | ||
nvjljf7rmor4 \_ redis.2 redis:7.4.1 worker2 Shutdown Rejected 23 seconds ago "No such image: redis@sha256:6…" | ||
vtiuz2fpc0yb \_ redis.2 redis:7.4.0 worker2 Shutdown Shutdown 1 second ago | ||
jnarweeha8x4 redis.3 redis:7.4.1 worker1 Running Running 3 seconds ago | ||
vs448yca2nz4 \_ redis.3 redis:7.4.0 worker1 Shutdown Shutdown 4 seconds ago | ||
jf1i992619ir redis.4 redis:7.4.1 worker1 Running Running 10 seconds ago | ||
blkttv7zs8ee \_ redis.4 redis:7.4.0 worker1 Shutdown Shutdown 11 seconds ago | ||
``` | ||
|
||
The number of items in the task history is determined by the | ||
|
@@ -82,10 +82,10 @@ example: | |
$ docker service ps --no-trunc redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
50qe8lfnxaxksi9w2a704wkp7 redis.1 redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 manager1 Running Running 5 minutes ago | ||
ky2re9oz86r9556i2szb8a8af \_ redis.1 redis:3.0.5@sha256:f8829e00d95672c48c60f468329d6693c4bdd28d1f057e755f8ba8b40008682e worker2 Shutdown Shutdown 5 minutes ago | ||
bk658fpbex0d57cqcwoe3jthu redis.2 redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 worker2 Running Running 5 seconds | ||
nvjljf7rmor4htv7l8rwcx7i7 \_ redis.2 redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 worker2 Shutdown Rejected 5 minutes ago "No such image: redis@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842" | ||
50qe8lfnxaxksi9w2a704wkp7 redis.1 redis:7.4.1@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 manager1 Running Running 5 minutes ago | ||
ky2re9oz86r9556i2szb8a8af \_ redis.1 redis:7.4.0@sha256:f8829e00d95672c48c60f468329d6693c4bdd28d1f057e755f8ba8b40008682e worker2 Shutdown Shutdown 5 minutes ago | ||
bk658fpbex0d57cqcwoe3jthu redis.2 redis:7.4.1@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 worker2 Running Running 5 seconds | ||
nvjljf7rmor4htv7l8rwcx7i7 \_ redis.2 redis:7.4.1@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842 worker2 Shutdown Rejected 5 minutes ago "No such image: redis@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842" | ||
``` | ||
|
||
### <a name="filter"></a> Filtering (--filter) | ||
|
@@ -111,8 +111,8 @@ The `id` filter matches on all or a prefix of a task's ID. | |
$ docker service ps -f "id=8" redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
8ryt076polmc redis.4 redis:3.0.6 worker1 Running Running 9 seconds | ||
8eaxrb2fqpbn redis.10 redis:3.0.6 manager1 Running Running 8 seconds | ||
8ryt076polmc redis.4 redis:7.4.1 worker1 Running Running 9 seconds | ||
8eaxrb2fqpbn redis.10 redis:7.4.1 manager1 Running Running 8 seconds | ||
``` | ||
|
||
#### name | ||
|
@@ -123,7 +123,7 @@ The `name` filter matches on task names. | |
$ docker service ps -f "name=redis.1" redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
qihejybwf1x5 redis.1 redis:3.0.6 manager1 Running Running 8 seconds | ||
qihejybwf1x5 redis.1 redis:7.4.1 manager1 Running Running 8 seconds | ||
``` | ||
|
||
|
||
|
@@ -135,10 +135,10 @@ The `node` filter matches on a node name or a node ID. | |
$ docker service ps -f "node=manager1" redis | ||
|
||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS | ||
0qihejybwf1x redis.1 redis:3.0.6 manager1 Running Running 8 seconds | ||
1x0v8yomsncd redis.5 redis:3.0.6 manager1 Running Running 8 seconds | ||
3w1wu13yupln redis.9 redis:3.0.6 manager1 Running Running 8 seconds | ||
8eaxrb2fqpbn redis.10 redis:3.0.6 manager1 Running Running 8 seconds | ||
0qihejybwf1x redis.1 redis:7.4.1 manager1 Running Running 8 seconds | ||
1x0v8yomsncd redis.5 redis:7.4.1 manager1 Running Running 8 seconds | ||
3w1wu13yupln redis.9 redis:7.4.1 manager1 Running Running 8 seconds | ||
8eaxrb2fqpbn redis.10 redis:7.4.1 manager1 Running Running 8 seconds | ||
``` | ||
|
||
#### desired-state | ||
|
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
Oops, something went wrong.
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.
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.
Perhaps we should use
7.4
(or even7
), to prevent these examples getting outdated. Generally, my recommendation would be to pin to either major, or major.minor, as patch releases should always be safe to update (and may contain security updates).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.
I agree in principle, but I wanted to keep the patch version (and character count of this string) to avoid having to worry about whitespace alignment. If we change to 7 or 7.4, we need to fix the whitespace padding on the header row etc.
At some point I would like to replace the redis examples with something open source instead.
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.
Ah, right, that's fair.
I also left this comment before considering that one of the examples needs to show "updating", and I guess for that it makes more sense to update to a newer patch release (compared to "minor" release).