Skip to content

Commit 92e2068

Browse files
committed
[Desktop] remove content refering to removed "osxfs" topic
This topic was removed in 9bebb66 We may want to add back the part describing sharing sshagent somewhere, which is not really a feature related to osxfs. Also, some generic description about file sharing (permissions, syncing) should probably be added back. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent f3412ac commit 92e2068

File tree

7 files changed

+8
-115
lines changed

7 files changed

+8
-115
lines changed

_includes/body-landing.html

-6
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,6 @@ <h6>FAQs</h6>
232232
How do I connect to a container from Mac?
233233
</a>
234234
</p>
235-
<p class="only-mac">
236-
<a href="/docker-for-mac/faqs/#can-i-use-an-ssh-agent-inside-a-container">
237-
Can I use an SSH agent inside a container?
238-
</a>
239-
</p>
240235
<p class="only-mac">
241236
<a href="/docker-for-mac/faqs/">
242237
View all
@@ -252,7 +247,6 @@ <h6>Popular articles</h6>
252247
<p class="only-win"><a href="/docker-for-windows/release-notes/">Stable Release notes</a></p>
253248
<p class="only-win"><a href="/docker-for-windows/troubleshoot/">Logs and troubleshooting</a></p>
254249
<p class="only-mac"><a href="/docker-for-mac/networking/">Networking features in Docker Desktop</a></p>
255-
<p class="only-mac"><a href="/docker-for-mac/osxfs/">Mac file system sharing</a></p>
256250
</div>
257251
</div>
258252
<!-- HUB -->

compose/compose-file/index.md

-36
Original file line numberDiff line numberDiff line change
@@ -2042,9 +2042,6 @@ expressed in the short form.
20422042
created
20432043
- `tmpfs`: configure additional tmpfs options
20442044
- `size`: the size for the tmpfs mount in bytes
2045-
- `consistency`: the consistency requirements of the mount, one of `consistent`
2046-
(host and container have identical view), `cached` (read cache, host view is
2047-
authoritative) or `delegated` (read-write cache, container's view is authoritative)
20482045

20492046
```yaml
20502047
version: "{{ site.compose_file_v3 }}"
@@ -2115,39 +2112,6 @@ services:
21152112
constraints: [node.role == manager]
21162113
```
21172114

2118-
#### Caching options for volume mounts (Docker Desktop for Mac)
2119-
2120-
You can configure container-and-host consistency requirements for bind-mounted
2121-
directories in Compose files to allow for better performance on read/write of
2122-
volume mounts. These options address issues specific to `osxfs` file sharing,
2123-
and therefore are only applicable on Docker Desktop for Mac.
2124-
2125-
The flags are:
2126-
2127-
* `consistent`: Full consistency. The container runtime and the host maintain an
2128-
identical view of the mount at all times. This is the default.
2129-
* `cached`: The host's view of the mount is authoritative. There may be delays
2130-
before updates made on the host are visible within a container.
2131-
* `delegated`: The container runtime's view of the mount is authoritative. There
2132-
may be delays before updates made in a container are visible on the host.
2133-
2134-
Here is an example of configuring a volume as `cached`:
2135-
2136-
```yaml
2137-
version: "{{ site.compose_file_v3 }}"
2138-
services:
2139-
php:
2140-
image: php:7.1-fpm
2141-
ports:
2142-
- "9000"
2143-
volumes:
2144-
- .:/var/www/project:cached
2145-
```
2146-
2147-
Full detail on these flags, the problems they solve, and their
2148-
`docker run` counterparts is in the Docker Desktop for Mac topic
2149-
[Performance tuning for volume mounts (shared filesystems)](../../docker-for-mac/osxfs-caching.md).
2150-
21512115
### domainname, hostname, ipc, mac\_address, privileged, read\_only, shm\_size, stdin\_open, tty, user, working\_dir
21522116

21532117
Each of these is a single value, analogous to its

desktop/enterprise/user/mac-user.md

-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ File sharing settings include the following options:
119119
120120
For more information, see:
121121
122-
- [Namespaces](https://docs.docker.com/docker-for-mac/osxfs/#namespaces) in [osxfs file system sharing](https://docs.docker.com/docker-for-mac/osxfs/).
123-
124122
- [Volume mounting requires file sharing for any project directories outside of `/Users`](https://docs.docker.com/docker-for-mac/troubleshoot/#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).
125123
126124
#### Disk

docker-for-mac/edge-release-notes.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2089,7 +2089,7 @@ events or unexpected unmounts.
20892089

20902090
**Upgrades**
20912091

2092-
* FUSE 7.23 for [osxfs](osxfs.md)
2092+
* FUSE 7.23 for osxfs
20932093

20942094
**Known issues**
20952095

@@ -2098,13 +2098,13 @@ events or unexpected unmounts.
20982098
**Bug fixes and minor changes**
20992099

21002100
* UI improvements
2101-
* Fixed a problem in [osxfs](osxfs.md) where`mkdir` returned EBUSY but directory was created.
2101+
* Fixed a problem in osxfs where`mkdir` returned EBUSY but directory was created.
21022102

21032103
### Beta 11 Release (2016-05-10 1.11.1-beta11)
21042104

21052105
**New**
21062106

2107-
The `osxfs` file system now persists ownership changes in an extended attribute. (See the topic on [ownership](osxfs.md#ownership) in [Sharing the macOS file system with Docker containers](osxfs.md).)
2107+
The `osxfs` file system now persists ownership changes in an extended attribute.
21082108

21092109
**Upgrades**
21102110

docker-for-mac/faqs.md

-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ We recommend that you publish a port, or connect from another container. You can
7676
For more information and examples, see
7777
[I want to connect to a container from the Mac](networking.md#i-want-to-connect-to-a-container-from-the-mac) in the [Networking](networking.md) topic.
7878

79-
### Can I use an SSH agent inside a container?
80-
81-
Yes, you can use the host’s SSH agent inside a container. For more information, see [SSH agent forwarding](osxfs.md#ssh-agent-forwarding).
82-
8379
### How do I add custom CA certificates?
8480

8581
Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see

docker-for-mac/troubleshoot.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
303303
<a name="bind-mounted-dirs"></a>
304304
305305
* There are a number of issues with the performance of directories bind-mounted
306-
with `osxfs`. In particular, writes of small blocks, and traversals of large
306+
into containers. In particular, writes of small blocks, and traversals of large
307307
directories are currently slow. Additionally, containers that perform large
308308
numbers of directory operations, such as repeated scans of large directory
309309
trees, may suffer from poor performance. Applications that behave in this way
@@ -319,11 +319,10 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
319319
320320
As a work-around for this behavior, you can put vendor or third-party library
321321
directories in Docker volumes, perform temporary file system operations
322-
outside of `osxfs` mounts, and use third-party tools like Unison or `rsync` to
322+
outside of bind mounts, and use third-party tools like Unison or `rsync` to
323323
synchronize between container directories and bind-mounted directories. We are
324-
actively working on `osxfs` performance using a number of different
325-
techniques. To learn more, see the topic on
326-
[Performance issues, solutions, and roadmap](osxfs.md#performance-issues-solutions-and-roadmap).
324+
actively working on performance improvements using a number of different
325+
techniques. To learn more, see the [topic on our roadmap](https://github.com/docker/roadmap/issues/7){: target="_blank" rel="noopener" class="_" }.
327326
328327
* If your system does not have access to an NTP server, then after a hibernate
329328
the time seen by Docker Desktop may be considerably out of sync with the host.

storage/bind-mounts.md

+1-59
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ syntax separates them. Here is a comparison of the syntax for each flag.
4444
- The second field is the path where the file or directory is mounted in
4545
the container.
4646
- The third field is optional, and is a comma-separated list of options, such
47-
as `ro`, `consistent`, `delegated`, `cached`, `z`, and `Z`. These options
47+
as `ro`, `z`, and `Z`. These options
4848
are discussed below.
4949

5050
- **`--mount`**: Consists of multiple key-value pairs, separated by commas and each
@@ -64,9 +64,6 @@ syntax separates them. Here is a comparison of the syntax for each flag.
6464
- The `bind-propagation` option, if present, changes the
6565
[bind propagation](#configure-bind-propagation). May be one of `rprivate`,
6666
`private`, `rshared`, `shared`, `rslave`, `slave`.
67-
- The [`consistency`](#configure-mount-consistency-for-macos) option, if
68-
present, may be one of `consistent`, `delegated`, or `cached`. This setting
69-
only applies to Docker Desktop for Mac, and is ignored on all other platforms.
7067
- The `--mount` flag does not support `z` or `Z` options for modifying
7168
selinux labels.
7269

@@ -381,61 +378,6 @@ $ docker run -d \
381378
nginx:latest
382379
```
383380

384-
## Configure mount consistency for macOS
385-
386-
Docker Desktop for Mac uses `osxfs` to propagate directories and files shared from macOS
387-
to the Linux VM. This propagation makes these directories and files available to
388-
Docker containers running on Docker Desktop for Mac.
389-
390-
By default, these shares are fully-consistent, meaning that every time a write
391-
happens on the macOS host or through a mount in a container, the changes are
392-
flushed to disk so that all participants in the share have a fully-consistent
393-
view. Full consistency can severely impact performance in some cases. Docker
394-
17.05 and higher introduce options to tune the consistency setting on a
395-
per-mount, per-container basis. The following options are available:
396-
397-
- `consistent` or `default`: The default setting with full consistency, as
398-
described above.
399-
400-
- `delegated`: The container runtime's view of the mount is authoritative. There
401-
may be delays before updates made in a container are visible on the host.
402-
403-
- `cached`: The macOS host's view of the mount is authoritative. There may be
404-
delays before updates made on the host are visible within a container.
405-
406-
These options are completely ignored on all host operating systems except macOS.
407-
408-
The `--mount` and `-v` examples have the same result.
409-
410-
<ul class="nav nav-tabs">
411-
<li class="active"><a data-toggle="tab" data-group="mount" data-target="#mount-consistency"><code>--mount</code></a></li>
412-
<li><a data-toggle="tab" data-group="volume" data-target="#v-consistency"><code>-v</code></a></li>
413-
</ul>
414-
<div class="tab-content">
415-
<div id="mount-consistency" class="tab-pane fade in active" markdown="1">
416-
417-
```bash
418-
$ docker run -d \
419-
-it \
420-
--name devtest \
421-
--mount type=bind,source="$(pwd)"/target,destination=/app,consistency=cached \
422-
nginx:latest
423-
```
424-
425-
</div><!--mount-->
426-
<div id="v-consistency" class="tab-pane fade" markdown="1">
427-
428-
```bash
429-
$ docker run -d \
430-
-it \
431-
--name devtest \
432-
-v "$(pwd)"/target:/app:cached \
433-
nginx:latest
434-
```
435-
436-
</div><!--volume-->
437-
</div><!--tab-content-->
438-
439381
## Next steps
440382

441383
- Learn about [volumes](volumes.md).

0 commit comments

Comments
 (0)