Merge pull request #22268 from docker/published-update

publish updates from main

Author: sarahsanders-docker

_vendor/modules.txt

@@ -1,6 +1,6 @@
 # github.com/moby/moby v28.0.1+incompatible
 # github.com/moby/buildkit v0.20.1
-# github.com/docker/buildx v0.21.2
+# github.com/docker/buildx v0.21.3
 # github.com/docker/cli v28.0.1+incompatible
 # github.com/docker/compose/v2 v2.34.0
 # github.com/docker/scout-cli v1.15.0

content/guides/dotnet/deploy.md

@@ -64,7 +64,7 @@ spec:
           name: server
           imagePullPolicy: Always
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               hostPort: 8080
               protocol: TCP
           resources: {}
@@ -117,7 +117,7 @@ spec:
   ports:
     - name: "8080"
       port: 8080
-      targetPort: 80
+      targetPort: 8080
       nodePort: 30001
   selector:
     service: server

content/guides/dotnet/develop.md

@@ -182,9 +182,9 @@ $ docker container ls
 You should see output like the following.
 
 ```console
-CONTAINER ID   IMAGE                  COMMAND                  CREATED              STATUS                        PORTS                  NAMES
-cb36e310aa7e   docker-dotnet-server   "dotnet myWebApp.dll"    About a minute ago   Up About a minute             0.0.0.0:8080->80/tcp   docker-dotnet-server-1
-39fdcf0aff7b   postgres               "docker-entrypoint.s…"   About a minute ago   Up About a minute (healthy)   5432/tcp               docker-dotnet-db-1
+CONTAINER ID   IMAGE                  COMMAND                  CREATED              STATUS                        PORTS                    NAMES
+cb36e310aa7e   docker-dotnet-server   "dotnet myWebApp.dll"    About a minute ago   Up About a minute             0.0.0.0:8080->8080/tcp   docker-dotnet-server-1
+39fdcf0aff7b   postgres               "docker-entrypoint.s…"   About a minute ago   Up About a minute (healthy)   5432/tcp                 docker-dotnet-db-1
 ```
 
 In the previous example, the container ID is `39fdcf0aff7b`. Run the following command to connect to the postgres database in the container. Replace the container ID with your own container ID.
@@ -241,7 +241,7 @@ services:
       context: .
       target: final
     ports:
-      - 8080:80
+      - 8080:8080
     depends_on:
       db:
         condition: service_healthy
@@ -337,14 +337,14 @@ ENTRYPOINT ["dotnet", "myWebApp.dll"]
 
 The following is the updated `compose.yaml` file.
 
-```yaml {hl_lines="5"}
+```yaml {hl_lines=[5,15,16]}
 services:
   server:
     build:
       context: .
       target: development
     ports:
-      - 8080:80
+      - 8080:8080
     depends_on:
       db:
         condition: service_healthy
@@ -354,7 +354,6 @@ services:
           path: .
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://+:80'
   db:
     image: postgres
     restart: always

content/manuals/security/faqs/general.md

@@ -31,11 +31,13 @@ You can configure this through SSO using your IdP. Check with your IdP if they s
 
 ### How are sessions managed and do they expire?
 
-Docker Desktop uses tokens to manage sessions after a user signs in. Docker Desktop signs you out after 90 days, or 30 days of inactivity.
+Docker uses tokens to manage sessions after a user signs in:
 
-In Docker Hub, you need to re-authenticate after 24 hours. If users are authenticating using SSO, the default session timeout for the IdP is respected.
+- Docker Desktop signs you out after 90 days, or 30 days of inactivity.
+- Docker Hub and Docker Home sign you out after 24 hours.
 
-Custom settings per organization for sessions aren't supported.
+Custom settings per organization for sessions aren't supported. Currently,
+Docker does not support your IdP's default session timeout for SSO users.
 
 ### How does Docker attribute downloads to us and what data is used to classify or verify the user is part of our organization?
 

content/manuals/security/faqs/single-sign-on/faqs.md

@@ -61,4 +61,14 @@ securely](/security/for-admins/provisioning/group-mapping/#use-group-mapping-wit
 
 ### Are there any firewall rules required for SSO configuration?
 
-No. There are no specific firewall rules required for configuring SSO, as long as the domain `login.docker.com` is accessible. This domain is commonly accessible by default. However, in rare cases, some organizations may have firewall restrictions in place that block this domain. If you encounter issues during SSO setup, ensure that `login.docker.com` is allowed in your network's firewall settings.
+No. There are no specific firewall rules required for configuring SSO, as long as the domain `login.docker.com` is accessible. This domain is commonly accessible by default. However, in rare cases, some organizations may have firewall restrictions in place that block this domain. If you encounter issues during SSO setup, ensure that `login.docker.com` is allowed in your network's firewall settings.
+
+### Does Docker use my IdP's default session timeout?
+
+No. Currently, Docker does not support your IdP's default session timeout for
+SSO users.
+
+Docker's default user session timeouts are as follows:
+
+- Docker Desktop signs you out after 90 days, or 30 days of inactivity.
+- Docker Hub and Docker Home sign you out after 24 hours.

go.mod

@@ -3,7 +3,7 @@ module github.com/docker/docs
 go 1.23.6
 
 require (
-	github.com/docker/buildx v0.21.2 // indirect
+	github.com/docker/buildx v0.21.3 // indirect
 	github.com/docker/cli v28.0.1+incompatible // indirect
 	github.com/docker/compose/v2 v2.34.0 // indirect
 	github.com/docker/scout-cli v1.15.0 // indirect
@@ -12,7 +12,7 @@ require (
 )
 
 replace (
-	github.com/docker/buildx => github.com/docker/buildx v0.21.2
+	github.com/docker/buildx => github.com/docker/buildx v0.21.3
 	github.com/docker/cli => github.com/docker/cli v28.0.1+incompatible
 	github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.34.0
 	github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0

go.sum

@@ -98,6 +98,8 @@ github.com/docker/buildx v0.21.1 h1:YjV2k6CsSDbkDTOMsjARUIrj2xv+zZR+M2dtrRyzXhg=
 github.com/docker/buildx v0.21.1/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
 github.com/docker/buildx v0.21.2 h1:r09paH8q9nvAX2PR1ntRrc+C6FBH93bvKUsn1WOb/jU=
 github.com/docker/buildx v0.21.2/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
+github.com/docker/buildx v0.21.3 h1:LEmhk3D9WOboMeC+hlfOUnB1jylXcDfGHjqAL7Tvwks=
+github.com/docker/buildx v0.21.3/go.mod h1:8V4UMnlKsaGYwz83BygmIbJIFEAYGHT6KAv8akDZmqo=
 github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
 github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=