Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 1, 2022

back ports:

Some minor conflicts in the last cherry-pick due to adjacent line changes that are not in 20.10
I'm keeping this separate, as these commits require some changes in the docs repository.

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link

codecov-commenter commented Apr 1, 2022

Codecov Report

Merging #3525 (5420464) into 20.10 (a9d9bbf) will not change coverage.
The diff coverage is n/a.

❗ Current head 5420464 differs from pull request most recent head fb1fb99. Consider uploading reports for the commit fb1fb99 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##            20.10    #3525   +/-   ##
=======================================
  Coverage   58.57%   58.57%           
=======================================
  Files         299      299           
  Lines       21457    21457           
=======================================
  Hits        12569    12569           
  Misses       7970     7970           
  Partials      918      918           

@thaJeztah thaJeztah force-pushed the 20.10_backport_anchor_tags branch from 174deaa to cd3555d Compare April 21, 2022 14:03
@thaJeztah thaJeztah modified the milestones: 20.10.15, 20.10.16, 20.10.17 May 5, 2022
@thaJeztah thaJeztah modified the milestones: 20.10.17, 20.10.18 Jun 6, 2022
@thaJeztah thaJeztah modified the milestones: 20.10.18, 20.10.19 Sep 8, 2022
@thaJeztah thaJeztah force-pushed the 20.10_backport_anchor_tags branch from cd3555d to 5420464 Compare September 30, 2022 09:51
@thaJeztah thaJeztah modified the milestones: 20.10.19, 20.10.20, 20.10.21 Oct 13, 2022
@thaJeztah thaJeztah modified the milestones: 20.10.21, 20.10.22 Oct 25, 2022
@thaJeztah thaJeztah modified the milestones: 20.10.22, 20.10.23 Dec 19, 2022
@thaJeztah
Copy link
Member Author

thaJeztah commented Jan 6, 2023

This probably also needs

@thaJeztah thaJeztah force-pushed the 20.10_backport_anchor_tags branch from 5420464 to 8fa2c67 Compare January 7, 2023 11:10
thaJeztah and others added 6 commits January 7, 2023 12:51
With this, the sections are linked from the "options" table when
producing the documentation on docs.docker.com

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b87a0c1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This will generate "details_url" for options, so that the options
table on the pages at docs.docker.com link to the section describing
the option.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2b97672)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Mathieu Rollet <matletix@gmail.com>
(cherry picked from commit f41cbf9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Docker v1.12 is really old, so no need to continue including this
in the docs. Also reformatted a markdown table.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82805ad)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Some touch-ups in the attach reference and man-page;

- remove uses of old images (ubuntu 14.04)
- adds some more wording about `-i` and `-t` to use the detach sequence.
- use `--filter` instead of `grep` to list the container, to make the
  example more portable.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 74086bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
using latest ubuntu LTS, and alpine for some examples. Also syncing some
wording between the man-pages and online docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9ba371f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah and others added 7 commits January 7, 2023 12:51
Update the example output to not use deprecated storage drivers or
Windows versions.

Also removes the section about `--debug`, because the `docker info` output
depends on the _daemon_ (not the client) to have debug mode enabled.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cac78c2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Use /bin/sh in the examples, as it's more likely to be present in a
container than bash (some users got confused by this, so using plain
"sh" in the examples could lead to less confusion).

Also added some extra wording around defaults, and how they're inherited
by the exec'd process.

It's definitely not "perfect" yet (lots to do in this document to improve
it), but it's a start :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 60833d2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
Signed-off-by: David Karlsson <david.karlsson@docker.com>
(cherry picked from commit bfcadab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: David Karlsson <david.karlsson@docker.com>
(cherry picked from commit 7c0d6ec)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 71e5617)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 81b0512)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Kevin Alvarez <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 186dcf3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

once docker/docs#16461 is merged, we should probably be able to merge this one (otherwise CI in the docs repository will fail)

@thaJeztah thaJeztah marked this pull request as ready for review January 9, 2023 09:00
@thaJeztah
Copy link
Member Author

Thanks! Bringing this one in; then I'll update the docs PR (docker/docs#16460)

@thaJeztah thaJeztah merged commit c01f453 into docker:20.10 Jan 9, 2023
@thaJeztah thaJeztah deleted the 20.10_backport_anchor_tags branch January 9, 2023 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants