-
Notifications
You must be signed in to change notification settings - Fork 7.4k
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
Publish the latest updates from master #11070
Conversation
Original: on line 18 we have `images, err := cli.ImageList(context.Background(), types.ImageListOptions{})` which gives us an error of: ``` # command-line-arguments ./main.go:12:2: ctx declared but not used ``` *Fix:* on line 18 we need to have `images, err := cli.ImageList(ctx, types.ImageListOptions{})`
Fixing ImageList Go code
* Add a note to create a context in different subscription * Minor style updates Made a minor tweak to the style and wrapped the new note to 80 chars Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
s/form/from
add a note for non existence daemon.json
rename psycopg2 to psycopg2-binary
Postgres last version is now >12.0.0.
* Update index.md The proxies set in the Docker Desktop settings are actually not propagated in the containers automatically. The rationale being that we want the same UX on Windows/Mac and as on Linux. Related to #10890 * Minor update Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
* Correct proxies documentation for Docker Desktop The proxies set in the Docker Desktop settings are actually not propagated in the containers automatically. The rationale being that we want the same UX on Windows/Mac and as on Linux. Closes docker/for-win#3676 * Minor style updates * Wrap to 80 chars Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
* Bump docker-compose 1.26.1 Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com> * Minor style updates Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
Deploy preview for docsdocker ready! Built with commit 89b17b2 |
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.
LGTM, but left some comments for follow-ups
compose/reference/push.md
Outdated
@@ -31,5 +31,5 @@ services: | |||
|
|||
service2: | |||
build: . | |||
image: youruser/yourimage # goes to youruser DockerHub registry | |||
image: youruser/yourimage # goes to your user DockerHub registry |
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.
Wondering if this was a correct change (but I can see the confusion) I think this was meant to spell youruser
as that's the example username on Docker Hub.
Perhaps we should change to your-user
or your-username
or hub-username
We should likely change DockerHub
to Docker Hub
though 😅
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.
Agree. your-username
might be better to avoid confusion. I'll fix this now.
Your proxy settings, however, will not be propagated into the containers you start. | ||
If you wish to set the proxy settings for your containers, you need to define | ||
environment variables for them, just like you would do on Linux, for example: |
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 we no longer set the cli configuration (docker/cli#93)? Or did we not do so on Docker Desktop?
We should probably link to that section to explain how to set these proxies automatically for docker run
and docker build
(docker/cli#2224)
I think we have another location where we explain those (need to search)
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.
CC @mat007
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.
@thaJeztah #11071. Updated it to DockerID for clarity
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.
Or did we not do so on Docker Desktop?
Maybe we did at some point (before my time), but it’s not the case anymore as I can’t find anything in the code base.
We should probably link to that section to explain how to set these proxies automatically for docker run and docker build
Ah good point!
|
||
```ps | ||
> docker run alpine env | ||
> docker run -e HTTP_PROXY=http://proxy.example.com:3128 alpine env |
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.
See my other comment
Update image push reference
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.
LGTM
PR to publish the latest updates from master