diff --git a/_data/toc.yaml b/_data/toc.yaml index 48794ed47f..e0a52a1efc 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1278,7 +1278,7 @@ manuals: title: Troubleshoot DDE issues on Mac - path: /ee/desktop/troubleshoot/windows-issues/ title: Troubleshoot DDE issues on Windows - - sectiontitle: Universal Control Plane + - sectiontitle: Universal Control Plane section: - path: /ee/ucp/ title: Universal Control Plane overview @@ -1467,6 +1467,12 @@ manuals: path: /ee/ucp/interlock/usage/interlock-vip-mode/ - title: Using routing labels path: /ee/ucp/interlock/usage/labels-reference/ + - title: Publishing a default host service + path: /ee/ucp/interlock/usage/default-backend/ + - title: Specifying a routing mode + path: /ee/ucp/interlock/usage/interlock-vip-mode/ + - title: Using routing labels + path: /ee/ucp/interlock/usage/labels-reference.md/ - title: Implementing redirects path: /ee/ucp/interlock/usage/redirects/ - title: Implementing a service cluster diff --git a/app-template/working-with-template.md b/app-template/working-with-template.md index 1cdec1b4cb..39cb2a79e8 100644 --- a/app-template/working-with-template.md +++ b/app-template/working-with-template.md @@ -442,4 +442,4 @@ The following table lists the `interpolator` binary options: | `-source` | none | Source file or folder to interpolate from| | `-destination` | none | Destination file or folder to copy the interpolated files to| | `-config` | `/run/configuration` | The path to the json configuration file | - | `-skip-template` | false | If set to `true`, it copies assets without any transformation | + | `-skip-template` | false | If set to `true`, it copies assets without any transformation | diff --git a/config/containers/logging/local.md b/config/containers/logging/local.md index 2cbe262ca0..dbd9d9974d 100644 --- a/config/containers/logging/local.md +++ b/config/containers/logging/local.md @@ -1,5 +1,4 @@ --- -<<<<<<< HEAD description: Describes how to use the local logging driver. keywords: local, docker, logging, driver redirect_from: @@ -19,42 +18,22 @@ uses automatic compression to reduce the size on disk. > file-format and storage mechanism are designed to be exclusively accessed by > the Docker daemon, and should not be used by external tools as the > implementation may change in future releases. -======= -description: Describes how to use the local binary (Protobuf) logging driver. -keywords: local, protobuf, docker, logging, driver -redirect_from: -- /engine/reference/logging/local/ -- /engine/admin/logging/local/ -title: local binary file Protobuf logging driver ---- - -This `log-driver` writes to `local` binary files using Protobuf [Protocol Buffers](https://en.wikipedia.org/wiki/Protocol_Buffers) ->>>>>>> Sync forked amberjack branch with docs-private (#1068) ## Usage To use the `local` driver as the default logging driver, set the `log-driver` and `log-opt` keys to appropriate values in the `daemon.json` file, which is located in `/etc/docker/` on Linux hosts or -<<<<<<< HEAD `C:\ProgramData\docker\config\daemon.json` on Windows Server. For more about configuring Docker using `daemon.json`, see [daemon.json](/engine/reference/commandline/dockerd.md#daemon-configuration-file). The following example sets the log driver to `local` and sets the `max-size` option. -======= -`C:\ProgramData\docker\config\daemon.json` on Windows Server. For more information about -configuring Docker using `daemon.json`, see -[daemon.json](/engine/reference/commandline/dockerd.md#daemon-configuration-file). - -The following example sets the log driver to `local`. ->>>>>>> Sync forked amberjack branch with docs-private (#1068) ```json { "log-driver": "local", -<<<<<<< HEAD "log-opts": { "max-size": "10m" } @@ -62,30 +41,13 @@ The following example sets the log driver to `local`. ``` Restart Docker for the changes to take effect for newly created containers. Existing containers do not use the new logging configuration. -======= - "log-opts": {} -} -``` - -> **Note**: `log-opt` configuration options in the `daemon.json` configuration -> file must be provided as strings. Boolean and numeric values (such as the value -> for `max-file` in the example above) must therefore be enclosed in quotes (`"`). - -Restart Docker for the changes to take effect for newly created containers. - -Existing containers will not use the new logging configuration. ->>>>>>> Sync forked amberjack branch with docs-private (#1068) You can set the logging driver for a specific container by using the `--log-driver` flag to `docker container create` or `docker run`: ```bash $ docker run \ -<<<<<<< HEAD --log-driver local --log-opt max-size=10m \ -======= - --log-driver local --log-opt compress="false" \ ->>>>>>> Sync forked amberjack branch with docs-private (#1068) alpine echo hello world ``` @@ -95,7 +57,6 @@ The `local` logging driver supports the following logging options: | Option | Description | Example value | |:------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------------------| -<<<<<<< HEAD | `max-size` | The maximum size of the log before it is rolled. A positive integer plus a modifier representing the unit of measure (`k`, `m`, or `g`). Defaults to 20m. | `--log-opt max-size=10m` | | `max-file` | The maximum number of log files that can be present. If rolling the logs creates excess files, the oldest file is removed. **Only effective when `max-size` is also set.** A positive integer. Defaults to 5. | `--log-opt max-file=3` | | `compress` | Toggle compression of rotated log files. Enabled by default. | `--log-opt compress=false` | @@ -108,8 +69,3 @@ files no larger than 10 megabytes each. ```bash $ docker run -it --log-opt max-size=10m --log-opt max-file=3 alpine ash ``` -======= -| `max-size` | The maximum size of each binary log file before rotation. A positive integer plus a modifier representing the unit of measure (`k`, `m`, or `g`). Defaults to `20m`. | `--log-opt max-size=10m` | -| `max-file` | The maximum number of binary log files. If rotating the logs creates an excess file, the oldest file is removed. **Only effective when `max-size` is also set.** A positive integer. Defaults to `5`. | `--log-opt max-file=5` | -| `compress` | Whether or not the binary files should be compressed. Defaults to `true` | `--log-opt compress=true` | ->>>>>>> Sync forked amberjack branch with docs-private (#1068) diff --git a/ee/desktop/app-designer.md b/ee/desktop/app-designer.md index 2431b69276..22333fd8cf 100644 --- a/ee/desktop/app-designer.md +++ b/ee/desktop/app-designer.md @@ -4,11 +4,7 @@ description: Docker Desktop Enterprise Application Designer keywords: Docker EE, Windows, Mac, Docker Desktop, Enterprise, templates, designer --- -<<<<<<< HEAD ## Overview -======= -# Overview ->>>>>>> 1013: Move desktop ent content to docs-private The Application Designer helps Docker developers quickly create new Docker apps using a library of templates. To start the Application @@ -43,4 +39,4 @@ Once assembled, the following screen allows you to run the application. Select * Use the corresponding buttons to start and stop your application. Select **Open in Finder** on Mac or **Open in Explorer** on Windows to view application files on disk. Select **Open in Visual Studio Code** to open files with an editor. Note that debug logs from the application are displayed in the lower part of the Application Designer -window. \ No newline at end of file +window. diff --git a/ee/desktop/user/mac-user.md b/ee/desktop/user/mac-user.md index 4ee9578598..87d372d747 100644 --- a/ee/desktop/user/mac-user.md +++ b/ee/desktop/user/mac-user.md @@ -1,5 +1,9 @@ --- title: Use Docker Desktop Enterprise on Mac +<<<<<<< HEAD +======= +description: Exploring the Mac user interface +>>>>>>> 63abf083a10c1191d6b54ce8349dcfd34afed463 keywords: Docker EE, Windows, Mac, Docker Desktop, Enterprise ---