Merge pull request #13364 from docker/master

Publish updates from master

_includes/navigation.html

@@ -20,8 +20,8 @@
     </button>
 </div>
 <div class="nav-container hidden-sm hidden-xs">
-    <div id="tabs">
+    <div>
-        <ul class="tabs jsTOCHorizontal">
+        <ul class="nav navbar-nav">
         {%- for entry in site.data.toc.horizontalnav -%}
           <li><a href="{{ entry.path }}" id="{{ entry.node }}">{{ entry.title }}</a></li>
         {%- endfor -%}

_layouts/docs.html

@@ -50,7 +50,7 @@
                     <nav class="col-nav">
                         <div id="sidebar-nav" class="sidebar hidden-sm hidden-xs">
                             <div id="navbar" class="nav-sidebar">
-                                <ul class="nav jsTOCHorizontal hidden-md hidden-lg"></ul>
+                                <ul class="nav hidden-md hidden-lg"></ul>
                                 <ul class="nav" id="jsTOCLeftNav"></ul>
                             </div>
                         </div>

_scss/_landing.scss

@@ -56,24 +56,6 @@ body.landing {
       }
     }
 
-    @include md-width {
-      .navbar-nav > li > a {
-        font-weight: bold;
-        line-height: 25px;
-        padding-top: 17px;
-        padding-bottom: 9px;
-        border-bottom-style: solid;
-        border-bottom-width: 4px;
-        border-bottom-color: rgba(255, 255, 255, 0);
-      }
-    }
-
-    @include md-width {
-      .navbar-nav > li.active > a {
-        border-bottom-color: rgba(255, 255, 255, 0.5);
-      }
-    }
-
     .toggle-mode {
       margin-top: 15px;
 

_scss/_mobile.scss

@@ -54,6 +54,7 @@
     and (max-width : 900px) {
     .sidebar {
         position: fixed;
+        top:   55px; // top-navigation bar (without breadcrumbs)
         width: 100%;
         z-index: 100;
         background-color: $bg-sidebar;
@@ -197,7 +198,7 @@
     }
     .sidebar {
         background-color: $bg-sidebar;
-        top: 51px;
+        top: 55px; // top-navigation bar (without breadcrumbs)
         left: 0;
         display: block;
         padding: 0;
@@ -253,9 +254,6 @@
   and (min-device-width: 768px)
   and (max-device-width: 1024px)
   and (orientation: landscape) {
-    .search-form {
-        float: left;
-    }
     .ctrl-right {
         display: block;
     }

_scss/_navigation.scss

@@ -58,16 +58,12 @@
 
 .nav-sidebar ul {
     list-style: none;
-    padding: 0 15px;
+    padding: 0;
     text-align: left;
 
     li {
         display: block;
     }
-
-    @include lg-width {
-        padding: 0 0 0 7px; // left-padding to align with logo
-    }
 }
 
 .nav-sidebar .nav ul {
@@ -83,6 +79,14 @@
 .nav-sidebar ul li a:focus,
 .nav-sidebar ul li a:hover {
     border-bottom: none;
+    border-left:   4px solid rgba($primary-links, 0);
+}
+
+.nav-sidebar .nav > li > a {
+  padding-left: 22px; // left-padding to align with logo
+  @include before-md-width {
+    padding-right: 32px; // right-align with hamburger menu
+  }
 }
 
 .nav-sidebar ul li a.active,
@@ -234,37 +238,36 @@ input:checked+.slider:before {
 /*
  * Tabs ************************************************************************
  */
-#tabs {
+
-    float: left;
+.navbar-nav > li > a {
-    margin: 0;
+  border-left:   4px solid rgba($white, 0.0);
-    padding-left: 8px;
-    ul {
-        padding: 0;
 }
+.navbar-nav > li.active > a {
+  border-left:   4px solid rgba($white, 0.75);
 }
 
-.tabs {
+@include md-width {
-    li {
+  .landing .navbar-nav > li > a {
-        float: left;
+    padding-top:    17px;
-        list-style: none;
+    padding-bottom:  9px;
-        a {
+  }
+  .navbar-nav > li > a {
     color:          $white;
-            padding: 17px 19px 14px 15px;
+    line-height:    25px;
-            float: left;
+    padding-top:    14px;
+    padding-bottom: 12px;
     font-weight:    600;
-            &:hover {
-                background: rgba(0, 0, 0, 0.17) !important;
-                border-bottom: 4px solid #fff;
-            }
-        }
-    }
-}
 
-.tabs li.active a {
+    &:hover {
-    background: transparent !important;
+      background-color: rgba(0, 0, 0, 0.17);
-    color: #fff;
+      border-bottom:    4px solid rgba($white, 0.75);
+    }
+  }
+  .navbar-nav > li.active > a {
     cursor:        default;
-    border-bottom: 4px solid #fff;
+    border-left:   none;
+    border-bottom: 4px solid rgba($white, 0.5);
+  }
 }
 
 /*

_scss/_night-mode.scss

@@ -61,8 +61,8 @@ body.night {
         background:  $bg-sidebar-night-active;
         border-left: 4px solid $primary-links;
     }
-    .tabs li.active a {
+    .navbar-nav > li.active > a {
-        border-bottom: 4px solid $primary-links;
+      border-color: $primary-links;
     }
     .slider {
         background-color: #344658;

_scss/_utilities.scss

@@ -82,7 +82,7 @@ img.inline {
  */
 .search-form {
     float: left;
-    margin: 5px 0 0;
+    margin: 5px 8px 0 0;
     & input[type=text] {
         background: rgba(0, 0, 0, 0.17) url("/images/search.png") no-repeat 10px 9px;
         border: 0;

desktop/mac/release-notes.md

@@ -51,14 +51,14 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.5.2
 2021-07-08
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg)
 
 ### New
 
 **Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
-
 ### Upgrades
 
 - [Compose V2 beta 6](https://github.com/docker/compose-cli/releases/tag/v2.0.0-beta.6)
@@ -83,8 +83,9 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.5.1
 2021-06-25
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg)
 
 ### New
 
@@ -99,8 +100,9 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.5.0
 2021-06-23
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg)
 
 ### New
 
@@ -134,8 +136,9 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.4.0
 2021-06-09
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg)
 
 ### New
 
@@ -183,8 +186,9 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.3.3
 2021-05-06
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg)
 
 ### Upgrades
 
@@ -198,8 +202,9 @@ This page contains information about the new features, improvements, known issue
 ### Docker Desktop 3.3.2
 2021-05-03
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg)
 
 ### Upgrades
 
@@ -223,8 +228,9 @@ This page contains information about the new features, improvements, known issue
 ## Docker Desktop 3.3.1
 2021-04-15
 
-[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg)
+> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg)
-[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg)
+
+> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg)
 
 ### New
 

desktop/windows/troubleshoot.md

@@ -54,6 +54,7 @@ from the menu.
 4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**.
 5. When the diagnostics have been uploaded, Docker Desktop prints a Diagnostic ID. Copy this ID.
 6. If you have subscribed to a Pro or a Team plan, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support.
+
    > **Note**
    >
    > You must be signed in to Docker Desktop using your Pro or Team plan credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support).
@@ -179,6 +180,94 @@ For an example of this issue and the resolution, see this issue on GitHub:
 [Docker RUN fails to execute shell
 script](https://github.com/moby/moby/issues/24388).
 
+#### Path conversion on Windows
+
+On Linux, the system takes care of mounting a path to another path. For example, when you run the following command on Linux:
+
+```console
+$ docker run --rm -ti -v /home/user/work:/work alpine
+```
+
+It adds a `/work` directory to the target container to mirror the specified path.
+
+However, on Windows, you must update the source path. For example, if you are using 
+the legacy Windows shell (`cmd.exe`), you can use the following command:
+
+```console
+$ docker run --rm -ti -v C:\Users\user\work:/work alpine
+```
+
+This starts the container and ensures the volume becomes usable. This is possible because Docker Desktop detects
+the Windows-style path and provides the appropriate conversion to mount the directory.
+
+Docker Desktop also allows you to use Unix-style path to the appropriate format. For example:
+
+```console
+$ docker run --rm -ti -v /c/Users/user/work:/work alpine ls /work
+```
+
+#### Working with Git Bash
+
+Git Bash (or MSYS) provides Unix-like environment on Windows. These tools apply their own
+preprocessing on the command line. For example, if you run the following command in Git Bash, it gives an error:
+
+```console
+$ docker run --rm -ti -v C:\Users\user\work:/work alpine
+docker: Error response from daemon: mkdir C:UsersUserwork: Access is denied.
+```
+
+This is because the `\` character has a special meaning in Git Bash. If you are using Git Bash, you must neutralize it using `\\`:
+
+```console
+$ docker run --rm -ti -v C:\\Users\\user\\work:/work alpine
+```
+
+Also, in scripts, the `pwd` command is used to avoid hardcoding file system locations. Its output is a Unix-style path.
+
+```console
+$ pwd
+/c/Users/user/work
+```
+
+Combined with the `$()` syntax, the command below works on Linux, however, it fails on Git Bash.
+
+```console
+$ docker run --rm -ti -v $(pwd):/work alpine
+docker: Error response from daemon: OCI runtime create failed: invalid mount {Destination:\Program Files\Git\work Type:bind Source:/run/desktop/mnt/host/c/Users/user/work;C Options:[rbind rprivate]}: mount destination \Program Files\Git\work not absolute: unknown.
+```
+
+You can work around this issue by using an extra `/`
+
+```console
+$ docker run --rm -ti -v /$(pwd):/work alpine
+```
+
+Portability of the scripts is not affected as Linux treats multiple `/` as a single entry.
+Each occurence of paths on a single line must be neutralized.
+
+```console
+$ docker run --rm -ti -v /$(pwd):/work alpine ls /work
+ls: C:/Program Files/Git/work: No such file or directory
+```
+
+In this example, The `$(pwd)` is not converted because of the preceding '/'. However, the second '/work' is transformed by the
+POSIX layer before passing it to Docker Desktop. You can also work around this issue by using an extra `/`.
+
+```console
+$ docker run --rm -ti -v /$(pwd):/work alpine ls //work
+```
+
+To verify whether the errors are generated from your script, or from another source, you can use an environment variable. For example:
+
+```console
+$ MSYS_NO_PATHCONV=1 docker run --rm -ti -v $(pwd):/work alpine ls /work
+```
+
+It only expects the environment variable here. The value doesn't matter.
+
+In some cases, MSYS also transforms colons to semicolon. Similar conversions can also occur
+when using `~` because the POSIX layer translates it to a DOS path. `MSYS_NO_PATHCONV` also works in this case.
+
 ### Virtualization
 
 Your machine must have the following features for Docker Desktop to function correctly.

storage/bind-mounts.md

@@ -91,6 +91,7 @@ on your development host. Use the following command to bind-mount the `target/`
 directory into your container at `/app/`. Run the command from within the
 `source` directory. The `$(pwd)` sub-command expands to the current working
 directory on Linux or macOS hosts.
+If you're on Windows, see also [Path conversions on Windows](../docker-for-windows/troubleshoot.md#path-conversions-on-windows)
 
 The `--mount` and `-v` examples below produce the same result. You
 can't run them both unless you remove the `devtest` container after running the