mirror of https://github.com/docker/docs.git
Merge branch 'master' into combine-eng-relnotes-737
This commit is contained in:
Anne Henmi
commit
9d5dbc0f86
|
|
@ -107,7 +107,7 @@ of [https://docs.docker.com/](https://docs.docker.com/).
|
|||
|
||||
## Staging the docs
|
||||
|
||||
You have three options:
|
||||
You have two options:
|
||||
|
||||
1. On your local machine, clone this repo and run our staging container:
|
||||
|
||||
|
|
@ -307,10 +307,9 @@ In order to keep the Git repository light, _please_ compress the images
|
|||
(losslessly). On Mac you may use (ImageOptim)[https://imageoptim.com] for
|
||||
instance. Be sure to compress the images *before* adding them to the
|
||||
repository, doing it afterwards actually worsens the impact on the Git repo (but
|
||||
still optimizes the bandwith during browsing).
|
||||
still optimizes the bandwidth during browsing).
|
||||
|
||||
## Beta content disclaimer
|
||||
|
||||
```bash
|
||||
> BETA DISCLAIMER
|
||||
>
|
||||
|
|
|
|||
22
_config.yml
22
_config.yml
|
|
@ -20,10 +20,10 @@ exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"]
|
|||
# You can't have - characters in these for non-YAML reasons
|
||||
|
||||
latest_stable_docker_engine_api_version: "1.37"
|
||||
docker_ce_stable_version: "18.03"
|
||||
docker_ce_edge_version: "18.08"
|
||||
docker_ce_stable_version: "18.09"
|
||||
docker_ce_edge_version: "18.09"
|
||||
docker_ee_version: "2.1"
|
||||
compose_version: "1.22.0"
|
||||
compose_version: "1.23.1"
|
||||
machine_version: "0.14.0"
|
||||
distribution_version: "2.6"
|
||||
dtr_version: "2.6"
|
||||
|
|
@ -62,7 +62,7 @@ dtr_versions:
|
|||
path: /datacenter/dtr/2.0/
|
||||
|
||||
tablabels:
|
||||
dee-2.0: Docker Enterprise Edition 2.0 Beta2
|
||||
dee-2.0: Docker Enterprise Edition 2.0
|
||||
ucp-3.0: Universal Control Plane 3.0
|
||||
ucp-2.2: Universal Control Plane 2.2
|
||||
dtr-2.5: Docker Trusted Registry 2.5
|
||||
|
|
@ -95,7 +95,7 @@ defaults:
|
|||
- scope:
|
||||
path: "install"
|
||||
values:
|
||||
win_latest_build: "docker-17.06.2-ee-16"
|
||||
win_latest_build: "docker-17.06.2-ee-17"
|
||||
- scope:
|
||||
path: "datacenter"
|
||||
values:
|
||||
|
|
@ -112,21 +112,21 @@ defaults:
|
|||
hide_from_sitemap: true
|
||||
dtr_org: "docker"
|
||||
dtr_repo: "dtr"
|
||||
dtr_version: "2.5.0"
|
||||
dtr_version: "2.5.6"
|
||||
- scope:
|
||||
path: "datacenter/dtr/2.4"
|
||||
values:
|
||||
hide_from_sitemap: true
|
||||
dtr_org: "docker"
|
||||
dtr_repo: "dtr"
|
||||
dtr_version: "2.4.6"
|
||||
dtr_version: "2.4.7"
|
||||
- scope:
|
||||
path: "datacenter/dtr/2.3"
|
||||
values:
|
||||
hide_from_sitemap: true
|
||||
dtr_org: "docker"
|
||||
dtr_repo: "dtr"
|
||||
dtr_version: "2.3.8"
|
||||
dtr_version: "2.3.9"
|
||||
- scope:
|
||||
path: "datacenter/dtr/2.2"
|
||||
values:
|
||||
|
|
@ -155,9 +155,9 @@ defaults:
|
|||
ucp_org: "docker"
|
||||
ucp_repo: "ucp"
|
||||
dtr_repo: "dtr"
|
||||
ucp_version: "3.0.4"
|
||||
ucp_version: "3.0.6"
|
||||
dtr_version: "2.5.0"
|
||||
dtr_latest_image: "docker/dtr:2.5.3"
|
||||
dtr_latest_image: "docker/dtr:2.5.6"
|
||||
- scope:
|
||||
path: "datacenter/ucp/3.0"
|
||||
values:
|
||||
|
|
@ -171,7 +171,7 @@ defaults:
|
|||
hide_from_sitemap: true
|
||||
ucp_org: "docker"
|
||||
ucp_repo: "ucp"
|
||||
ucp_version: "2.2.12"
|
||||
ucp_version: "2.2.14"
|
||||
- scope:
|
||||
path: "datacenter/ucp/2.1"
|
||||
values:
|
||||
|
|
|
|||
|
|
@ -6,6 +6,26 @@
|
|||
- product: "ucp"
|
||||
version: "3.0"
|
||||
tar-files:
|
||||
- description: "3.0.6 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_3.0.6.tar.gz
|
||||
- description: "3.0.6 IBM Z"
|
||||
url: https://packages.docker.com/caas/ucp_images_s390x_3.0.6.tar.gz
|
||||
- description: "3.0.6 Windows Server 2016 LTSC"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.6.tar.gz
|
||||
- description: "3.0.6 Windows Server 1709"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.6.tar.gz
|
||||
- description: "3.0.6 Windows Server 1803"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.6.tar.gz
|
||||
- description: "3.0.5 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_3.0.5.tar.gz
|
||||
- description: "3.0.5 IBM Z"
|
||||
url: https://packages.docker.com/caas/ucp_images_s390x_3.0.5.tar.gz
|
||||
- description: "3.0.5 Windows Server 2016 LTSC"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.5.tar.gz
|
||||
- description: "3.0.5 Windows Server 1709"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.5.tar.gz
|
||||
- description: "3.0.5 Windows Server 1803"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.5.tar.gz
|
||||
- description: "3.0.4 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_3.0.4.tar.gz
|
||||
- description: "3.0.4 IBM Z"
|
||||
|
|
@ -43,6 +63,18 @@
|
|||
- product: "ucp"
|
||||
version: "2.2"
|
||||
tar-files:
|
||||
- description: "2.2.14 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_2.2.14.tar.gz
|
||||
- description: "2.2.14 IBM Z"
|
||||
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.14.tar.gz
|
||||
- description: "2.2.14 Windows"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_2.2.14.tar.gz
|
||||
- description: "2.2.13 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_2.2.13.tar.gz
|
||||
- description: "2.2.13 IBM Z"
|
||||
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.13.tar.gz
|
||||
- description: "2.2.13 Windows"
|
||||
url: https://packages.docker.com/caas/ucp_images_win_2.2.13.tar.gz
|
||||
- description: "2.2.12 Linux"
|
||||
url: https://packages.docker.com/caas/ucp_images_2.2.12.tar.gz
|
||||
- description: "2.2.12 IBM Z"
|
||||
|
|
@ -112,33 +144,27 @@
|
|||
- product: "dtr"
|
||||
version: "2.5"
|
||||
tar-files:
|
||||
- description: "DTR 2.5.4 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.4.tar.gz
|
||||
- description: "DTR 2.5.4 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.4.tar.gz
|
||||
- description: "DTR 2.5.6 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.6.tar.gz
|
||||
- description: "DTR 2.5.5 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.5.tar.gz
|
||||
- description: "DTR 2.5.3 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.3.tar.gz
|
||||
- description: "DTR 2.5.3 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.3.tar.gz
|
||||
- description: "DTR 2.5.2 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.2.tar.gz
|
||||
- description: "DTR 2.5.2 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.2.tar.gz
|
||||
- description: "DTR 2.5.1 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.1.tar.gz
|
||||
- description: "DTR 2.5.1 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.1.tar.gz
|
||||
- description: "DTR 2.5.0 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.5.0.tar.gz
|
||||
- description: "DTR 2.5.0 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.0.tar.gz
|
||||
- product: "dtr"
|
||||
version: "2.4"
|
||||
tar-files:
|
||||
- description: "DTR 2.4.7 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz
|
||||
- description: "DTR 2.4.6 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz
|
||||
- description: "DTR 2.4.6 IBM Z"
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz
|
||||
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz
|
||||
- description: "DTR 2.4.5 Linux x86"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz
|
||||
- description: "DTR 2.4.5 IBM Z"
|
||||
|
|
@ -166,6 +192,8 @@
|
|||
- product: "dtr"
|
||||
version: "2.3"
|
||||
tar-files:
|
||||
- description: "DTR 2.3.9"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.3.9.tar.gz
|
||||
- description: "DTR 2.3.8"
|
||||
url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz
|
||||
- description: "DTR 2.3.7"
|
||||
|
|
|
|||
|
|
@ -149,6 +149,8 @@ guides:
|
|||
nosync: true
|
||||
- sectiontitle: Compatibility between Docker versions
|
||||
section:
|
||||
- path: /engine/ce-ee-node-activate/
|
||||
title: CE-EE Node Activate
|
||||
- path: /engine/migration/
|
||||
title: Migrate to Docker 1.10
|
||||
- path: /engine/breaking_changes/
|
||||
|
|
@ -1570,6 +1572,8 @@ manuals:
|
|||
title: Create UCP audit logs
|
||||
- path: /ee/ucp/admin/configure/enable-saml-authentication/
|
||||
title: Enable SAML authentication
|
||||
- path: /ee/ucp/admin/configure/enable-helm-tiller/
|
||||
title: Enable Helm and Tiller with UCP
|
||||
- path: /ee/ucp/admin/configure/external-auth/
|
||||
title: Integrate with LDAP
|
||||
- path: /ee/ucp/admin/configure/license-your-installation/
|
||||
|
|
@ -1723,6 +1727,8 @@ manuals:
|
|||
path: /ee/ucp/interlock/upgrade/
|
||||
- sectiontitle: Deploy apps with Kubernetes
|
||||
section:
|
||||
- title: Access Kubernetes Resources
|
||||
path: /ee/ucp/kubernetes/kube-resources/
|
||||
- title: Deploy a workload
|
||||
path: /ee/ucp/kubernetes/
|
||||
- title: Deploy a Compose-based app
|
||||
|
|
@ -2346,11 +2352,11 @@ manuals:
|
|||
- sectiontitle: Manage jobs
|
||||
section:
|
||||
- path: /ee/dtr/admin/manage-jobs/job-queue/
|
||||
title: Job Queue
|
||||
title: Job Queue
|
||||
- path: /ee/dtr/admin/manage-jobs/audit-jobs-via-ui/
|
||||
title: Audit Jobs with the Web Interface
|
||||
title: Audit Jobs with the Web Interface
|
||||
- path: /ee/dtr/admin/manage-jobs/audit-jobs-via-api/
|
||||
title: Audit Jobs with the API
|
||||
title: Audit Jobs with the API
|
||||
- path: /ee/dtr/admin/manage-jobs/auto-delete-job-logs/
|
||||
title: Enable Auto-Deletion of Job Logs
|
||||
- sectiontitle: Monitor and troubleshoot
|
||||
|
|
@ -2390,6 +2396,8 @@ manuals:
|
|||
section:
|
||||
- path: /ee/dtr/user/manage-images/
|
||||
title: Create a repository
|
||||
- path: /ee/dtr/user/review-repository-info/
|
||||
title: Review repository info
|
||||
- path: /ee/dtr/user/manage-images/pull-and-push-images/
|
||||
title: Pull and push images
|
||||
- path: /ee/dtr/user/manage-images/delete-images/
|
||||
|
|
@ -2423,7 +2431,7 @@ manuals:
|
|||
- sectiontitle: Manage repository events
|
||||
section:
|
||||
- title: Audit repository events
|
||||
path: /ee/dtr/user/manage-repository-events/
|
||||
path: /ee/dtr/user/audit-repository-events/
|
||||
- title: Auto-delete repository events
|
||||
path: /ee/dtr/admin/configure/auto-delete-repo-events/
|
||||
- path: /ee/dtr/user/create-and-manage-webhooks/
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{% assign green-check = '{: style="height: 14px; margin: 0 auto"}' %}
|
||||
|
||||
| Capabilities | Community Edition | Enterprise Edition Basic | Enterprise Edition Standard | Enterprise Edition Advanced |
|
||||
|:------------------------------------------------------------------|:------------------|:-------------------------|:----------------------------|:----------------------------|
|
||||
| Container engine and built in orchestration, networking, security | {{green-check}} | {{green-check}} | {{green-check}} | {{green-check}} |
|
||||
| Certified infrastructure, plugins and ISV containers | | {{green-check}} | {{green-check}} | {{green-check}} |
|
||||
| Image management | | | {{green-check}} | {{green-check}} |
|
||||
| Container app management | | | {{green-check}} | {{green-check}} |
|
||||
| Image security scanning | | | | {{green-check}} |
|
||||
| Capabilities | Docker Engine - Community | Docker Engine - Enterprise | Docker Enterprise |
|
||||
|:---------------------------------------------------------------------|:------------------:|:-------------------------:|:----------------------------:|
|
||||
| Container engine and built in orchestration, networking, security | {{green-check}} | {{green-check}} | {{green-check}} |
|
||||
| Certified infrastructure, plugins and ISV containers | | {{green-check}} | {{green-check}} |
|
||||
| Image management | | | {{green-check}} |
|
||||
| Container app management | | | {{green-check}} |
|
||||
| Image security scanning | | | {{green-check}} |
|
||||
|
|
|
|||
|
|
@ -116,6 +116,16 @@ You only need to set up the repository once, after which you can install Docker
|
|||
|
||||
{% endif %}
|
||||
|
||||
{% if linux-dist == "oraclelinux" %}
|
||||
|
||||
5. Enable the `ol7_addons` Oracle repository. This ensures access to the `container-selinux` package required by `docker-ee`.
|
||||
|
||||
```bash
|
||||
$ sudo yum-config-manager --enable ol7_addons
|
||||
```
|
||||
|
||||
{% endif %}
|
||||
|
||||
6. Add the Docker EE **stable** repository:
|
||||
|
||||
```bash
|
||||
|
|
@ -301,6 +311,6 @@ You must delete any edited configuration files manually.
|
|||
|
||||
- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md){: target="_blank" class="_" }
|
||||
|
||||
- Continue with user guides on [Universal Control Plane (UCP)](/datacenter/ucp/2.2/guides/){: target="_blank" class="_" } and [Docker Trusted Registry (DTR)](/datacenter/dtr/2.4/guides/){: target="_blank" class="_" }
|
||||
- Continue with user guides on [Universal Control Plane (UCP)](/ee/ucp/){: target="_blank" class="_" } and [Docker Trusted Registry (DTR)](/ee/dtr/){: target="_blank" class="_" }
|
||||
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -42,20 +42,24 @@ $ curl -fsSL https://get.docker.com -o get-docker.sh
|
|||
$ sudo sh get-docker.sh
|
||||
|
||||
<output truncated>
|
||||
```
|
||||
|
||||
If you would like to use Docker as a non-root user, you should now consider
|
||||
adding your user to the "docker" group with something like:
|
||||
|
||||
```bash
|
||||
sudo usermod -aG docker your-user
|
||||
```
|
||||
|
||||
Remember to log out and back in for this to take effect!
|
||||
|
||||
WARNING: Adding a user to the "docker" group grants the ability to run
|
||||
containers which can be used to obtain root privileges on the
|
||||
docker host.
|
||||
Refer to https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface
|
||||
for more information.
|
||||
```
|
||||
> **Warning**:
|
||||
>
|
||||
> Adding a user to the "docker" group grants the ability to run containers
|
||||
> which can be used to obtain root privileges on the docker host. Refer to
|
||||
> [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface)
|
||||
> for more information.
|
||||
{:.warning}
|
||||
|
||||
Docker CE is installed. It starts automatically on `DEB`-based distributions. On
|
||||
`RPM`-based distributions, you need to start it manually using the appropriate
|
||||
|
|
|
|||
|
|
@ -12,12 +12,11 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %}
|
|||
{% if platform == "mac" %}
|
||||
{% assign product = "Docker for Mac" %}
|
||||
|
||||
{% capture min-version %}{{ product }} 17.12 CE Edge{% endcapture %}
|
||||
|
||||
{% capture min-version %}{{ product }} **17.12 CE Edge**{% endcapture %}
|
||||
|
||||
{% capture version-caveat %}
|
||||
**Kubernetes is only available in {{ min-version }} and higher, on the Edge
|
||||
channel.** Kubernetes support is not included in Docker for Mac Stable releases.
|
||||
{% endcapture %}
|
||||
Kubernetes is available in {{ min-version }} and higher, and **18.06 Stable** and higher
|
||||
{% endcapture%}
|
||||
|
||||
{% capture local-kubectl-warning %}
|
||||
> If you independently installed the Kubernetes CLI, `kubectl`, make sure that
|
||||
|
|
@ -32,26 +31,21 @@ channel.** Kubernetes support is not included in Docker for Mac Stable releases.
|
|||
{% elsif platform == "windows" %}
|
||||
{% assign product = "Docker for Windows" %}
|
||||
|
||||
{% capture min-version %}{{ product }} 18.02 CE Edge{% endcapture %}
|
||||
{% capture min-version %}{{ product }} **18.02 CE Edge**{% endcapture %}
|
||||
|
||||
{% capture version-caveat %}
|
||||
**Kubernetes is only available in {{ min-version }}.** Kubernetes
|
||||
support is not included in {{ product }} 18.02 CE Stable.
|
||||
Kubernetes is available in {{ min-version }} and higher, and **18.06 Stable** and higher
|
||||
{% endcapture %}
|
||||
|
||||
{% capture local-kubectl-warning %}
|
||||
If you installed `kubectl` by another method, and experience conflicts, remove it.
|
||||
If you installed `kubectl` by another method, and experience conflicts, remove it.
|
||||
{% endcapture %}
|
||||
|
||||
{% assign kubectl-path = "C:\>Program Files\Docker\Docker\Resources\bin\kubectl.exe" %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{{ version-caveat }} To find out more about Stable and Edge channels and how to
|
||||
switch between them, see
|
||||
[General configuration](/docker-for-{{ platform }}/#general).
|
||||
|
||||
{{ min-version }} includes a standalone Kubernetes server and client,
|
||||
{{ version-caveat }}, this includes a standalone Kubernetes server and client,
|
||||
as well as Docker CLI integration. The Kubernetes server runs locally within
|
||||
your Docker instance, is not configurable, and is a single-node cluster.
|
||||
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ memory | The memory limit of the container in MB (see [Runtime Constraints on CP
|
|||
memory_swap | Total memory limit (memory + swap) of the container in MB
|
||||
autorestart | Whether to restart the container automatically if it stops (see [Crash recovery](/docker-cloud/apps/autorestart/) for more information)
|
||||
autodestroy | Whether to terminate the container automatically if it stops (see [Autodestroy](/docker-cloud/apps/auto-destroy/) for more information)
|
||||
roles | List of Docker Cloud roles asigned to this container (see [API roles](/docker-cloud/apps/api-roles/) for more information))
|
||||
roles | List of Docker Cloud roles assigned to this container (see [API roles](/docker-cloud/apps/api-roles/) for more information))
|
||||
linked_to_container | List of IP addresses of the linked containers (see table `Container Link attributes` below and [Service links](/docker-cloud/apps/service-links/) for more information)
|
||||
link_variables | List of environment variables that would be exposed in any container that is linked to this one
|
||||
privileged | Whether the container has Docker's `privileged` flag set or not (see [Runtime privilege](/engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration) for more information)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* - highlight element tag and class names can be specified in options
|
||||
*
|
||||
* Usage:
|
||||
* // wrap every occurrance of text 'lorem' in content
|
||||
* // wrap every occurrence of text 'lorem' in content
|
||||
* // with <span class='highlight'> (default options)
|
||||
* $('#content').highlight('lorem');
|
||||
*
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
* // don't ignore case during search of term 'lorem'
|
||||
* $('#content').highlight('lorem', { caseSensitive: true });
|
||||
*
|
||||
* // wrap every occurrance of term 'ipsum' in content
|
||||
* // wrap every occurrence of term 'ipsum' in content
|
||||
* // with <em class='important'>
|
||||
* $('#content').highlight('ipsum', { element: 'em', className: 'important' });
|
||||
*
|
||||
|
|
|
|||
|
|
@ -858,7 +858,7 @@
|
|||
|
||||
}
|
||||
|
||||
// Maintains chainablity
|
||||
// Maintains chainability
|
||||
return self;
|
||||
|
||||
},
|
||||
|
|
@ -911,7 +911,7 @@
|
|||
|
||||
}
|
||||
|
||||
// Maintains chainablity
|
||||
// Maintains chainability
|
||||
return self;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1667,7 +1667,7 @@
|
|||
|
||||
/**
|
||||
* lunr.trimmer is a pipeline function for trimming non word
|
||||
* characters from the begining and end of tokens before they
|
||||
* characters from the beginning and end of tokens before they
|
||||
* enter the index.
|
||||
*
|
||||
* This implementation may not work correctly for non latin
|
||||
|
|
@ -1891,7 +1891,7 @@
|
|||
} else if (typeof exports === 'object') {
|
||||
/**
|
||||
* Node. Does not work with strict CommonJS, but
|
||||
* only CommonJS-like enviroments that support module.exports,
|
||||
* only CommonJS-like environments that support module.exports,
|
||||
* like Node.
|
||||
*/
|
||||
module.exports = factory()
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
<p>An action represents an API call by a user. Details of the API call such as timestamp, origin IP address, and user agent are logged in the action object.</p>
|
||||
|
||||
<p>Simple API calls that do not require asynchronous execution will return immediately with the appropiate HTTP error code and an action object will be created either in <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> states. API calls that do require asynchronous execution will return HTTP code <code class="prettyprint">202 Accepted</code> immediately and create an action object in <code class="prettyprint">In progress</code> state, which will change to <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> state depending on the outcome of the operation being performed. In both cases the response will include a <code class="prettyprint">X-DockerCloud-Action-URI</code> header with the resource URI of the created action.</p>
|
||||
<p>Simple API calls that do not require asynchronous execution will return immediately with the appropriate HTTP error code and an action object will be created either in <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> states. API calls that do require asynchronous execution will return HTTP code <code class="prettyprint">202 Accepted</code> immediately and create an action object in <code class="prettyprint">In progress</code> state, which will change to <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> state depending on the outcome of the operation being performed. In both cases the response will include a <code class="prettyprint">X-DockerCloud-Action-URI</code> header with the resource URI of the created action.</p>
|
||||
|
||||
<h3 id="attributes">Attributes</h3>
|
||||
|
||||
|
|
|
|||
|
|
@ -470,7 +470,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>roles</td>
|
||||
<td>List of Docker Cloud roles asigned to this container (see <a href="/docker-cloud/apps/api-roles/">API roles</a> for more information))</td>
|
||||
<td>List of Docker Cloud roles assigned to this container (see <a href="/docker-cloud/apps/api-roles/">API roles</a> for more information))</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>linked_to_container</td>
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left">action</td>
|
||||
<td style="text-align: left">Type of action that was executed on the object. Posible values: <code class="prettyprint">create</code>, <code class="prettyprint">update</code> or <code class="prettyprint">delete</code></td>
|
||||
<td style="text-align: left">Type of action that was executed on the object. Possible values: <code class="prettyprint">create</code>, <code class="prettyprint">update</code> or <code class="prettyprint">delete</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left">parents</td>
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@
|
|||
|
||||
<ul>
|
||||
<li><code class="prettyprint">id</code>: AWS VPC identifier of the target VPC where the nodes of the cluster will be deployed (required)</li>
|
||||
<li><code class="prettyprint">subnets</code>: a list of target subnet indentifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)</li>
|
||||
<li><code class="prettyprint">subnets</code>: a list of target subnet identifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)</li>
|
||||
<li><code class="prettyprint">security_groups</code>: the security group that will be applied to every node of the cluster (optional)</li>
|
||||
</ul></li>
|
||||
<li><code class="prettyprint">iam</code>: IAM-related options (optional)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ e.TokenStore=function(){this.root={docs:{}},this.length=0},e.TokenStore.load=fun
|
|||
* - highlight element tag and class names can be specified in options
|
||||
*
|
||||
* Usage:
|
||||
* // wrap every occurrance of text 'lorem' in content
|
||||
* // wrap every occurrence of text 'lorem' in content
|
||||
* // with <span class='highlight'> (default options)
|
||||
* $('#content').highlight('lorem');
|
||||
*
|
||||
|
|
@ -97,7 +97,7 @@ e.TokenStore=function(){this.root={docs:{}},this.length=0},e.TokenStore.load=fun
|
|||
* // don't ignore case during search of term 'lorem'
|
||||
* $('#content').highlight('lorem', { caseSensitive: true });
|
||||
*
|
||||
* // wrap every occurrance of term 'ipsum' in content
|
||||
* // wrap every occurrence of term 'ipsum' in content
|
||||
* // with <em class='important'>
|
||||
* $('#content').highlight('ipsum', { element: 'em', className: 'important' });
|
||||
*
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ set this globally, or specify it before each CLI command. To learn more, see the
|
|||
|
||||
<p>An action represents an API call by a user. Details of the API call such as timestamp, origin IP address, and user agent are logged in the action object.</p>
|
||||
|
||||
<p>Simple API calls that do not require asynchronous execution will return immediately with the appropiate HTTP error code and an action object will be created either in <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> states. API calls that do require asynchronous execution will return HTTP code <code class="prettyprint">202 Accepted</code> immediately and create an action object in <code class="prettyprint">In progress</code> state, which will change to <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> state depending on the outcome of the operation being performed. In both cases the response will include a <code class="prettyprint">X-DockerCloud-Action-URI</code> header with the resource URI of the created action.</p>
|
||||
<p>Simple API calls that do not require asynchronous execution will return immediately with the appropriate HTTP error code and an action object will be created either in <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> states. API calls that do require asynchronous execution will return HTTP code <code class="prettyprint">202 Accepted</code> immediately and create an action object in <code class="prettyprint">In progress</code> state, which will change to <code class="prettyprint">Success</code> or <code class="prettyprint">Failed</code> state depending on the outcome of the operation being performed. In both cases the response will include a <code class="prettyprint">X-DockerCloud-Action-URI</code> header with the resource URI of the created action.</p>
|
||||
|
||||
<h3 id="attributes">Attributes</h3>
|
||||
|
||||
|
|
@ -1450,7 +1450,7 @@ set this globally, or specify it before each CLI command. To learn more, see the
|
|||
|
||||
<ul>
|
||||
<li><code class="prettyprint">id</code>: AWS VPC identifier of the target VPC where the nodes of the cluster will be deployed (required)</li>
|
||||
<li><code class="prettyprint">subnets</code>: a list of target subnet indentifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)</li>
|
||||
<li><code class="prettyprint">subnets</code>: a list of target subnet identifiers inside selected VPC. If you specify more than one subnet, Docker Cloud will balance among all of them following a high-availability schema (optional)</li>
|
||||
<li><code class="prettyprint">security_groups</code>: the security group that will be applied to every node of the cluster (optional)</li>
|
||||
</ul></li>
|
||||
<li><code class="prettyprint">iam</code>: IAM-related options (optional)
|
||||
|
|
@ -5263,7 +5263,7 @@ docker-cloud tag <span class="nb">set</span> -t tag-2 7eaf7fff
|
|||
</tr>
|
||||
<tr>
|
||||
<td>roles</td>
|
||||
<td>List of Docker Cloud roles asigned to this container (see <a href="/docker-cloud/apps/api-roles/">API roles</a> for more information))</td>
|
||||
<td>List of Docker Cloud roles assigned to this container (see <a href="/docker-cloud/apps/api-roles/">API roles</a> for more information))</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>linked_to_container</td>
|
||||
|
|
@ -6326,7 +6326,7 @@ container.execute("ls", handler=msg_handler)
|
|||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left">action</td>
|
||||
<td style="text-align: left">Type of action that was executed on the object. Posible values: <code class="prettyprint">create</code>, <code class="prettyprint">update</code> or <code class="prettyprint">delete</code></td>
|
||||
<td style="text-align: left">Type of action that was executed on the object. Possible values: <code class="prettyprint">create</code>, <code class="prettyprint">update</code> or <code class="prettyprint">delete</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left">parents</td>
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ configure this app to use our SQL Server database, and then create a
|
|||
|
||||
This file defines how to build the web app image. It uses the
|
||||
[microsoft/aspnetcore-build](https://hub.docker.com/r/microsoft/aspnetcore-build/),
|
||||
map the volume with the generated code, restore the dependencies, build the
|
||||
project and expose port 80. After that, it calls an `entrypoint` script
|
||||
maps the volume with the generated code, restores the dependencies, builds the
|
||||
project and exposes port 80. After that, it calls an `entrypoint` script
|
||||
that we create in the next step.
|
||||
|
||||
1. The `Dockerfile` makes use of an entrypoint to your webapp Docker
|
||||
|
|
@ -186,7 +186,7 @@ configure this app to use our SQL Server database, and then create a
|
|||
Go ahead and try out the website! This sample uses the SQL Server
|
||||
database image in the back-end for authentication.
|
||||
|
||||
Ready! You now have a ASP.NET Core application running against SQL Server in
|
||||
Ready! You now have an ASP.NET Core application running against SQL Server in
|
||||
Docker Compose! This sample made use of some of the most popular Microsoft
|
||||
products for Linux. To learn more about Windows Containers, check out
|
||||
[Docker Labs for Windows Containers](https://github.com/docker/labs/tree/master/windows)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ On a Mac, add the following to your `~/.bash_profile`:
|
|||
|
||||
```shell
|
||||
if [ -f $(brew --prefix)/etc/bash_completion ]; then
|
||||
. $(brew --prefix)/etc/bash_completion
|
||||
. $(brew --prefix)/etc/bash_completion
|
||||
fi
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ id.
|
|||
Sets the PID mode to the host PID mode. This turns on sharing between
|
||||
container and the host operating system the PID address space. Containers
|
||||
launched with this flag can access and manipulate other
|
||||
containers in the bare-metal machine's namespace and vise-versa.
|
||||
containers in the bare-metal machine's namespace and vice versa.
|
||||
|
||||
### ports
|
||||
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@ designated container or service.
|
|||
If set to "host", the service's PID mode is the host PID mode. This turns
|
||||
on sharing between container and the host operating system the PID address
|
||||
space. Containers launched with this flag can access and manipulate
|
||||
other containers in the bare-metal machine's namespace and vise-versa.
|
||||
other containers in the bare-metal machine's namespace and vice versa.
|
||||
|
||||
> **Note**: the `service:` and `container:` forms require
|
||||
> [version 2.1](compose-versioning.md#version-21) or above
|
||||
|
|
@ -1483,7 +1483,7 @@ Set a custom name for this volume.
|
|||
data:
|
||||
name: my-app-data
|
||||
|
||||
It can also be used in conjuction with the `external` property:
|
||||
It can also be used in conjunction with the `external` property:
|
||||
|
||||
version: '2.1'
|
||||
volumes:
|
||||
|
|
@ -1641,7 +1641,7 @@ Set a custom name for this network.
|
|||
network1:
|
||||
name: my-app-net
|
||||
|
||||
It can also be used in conjuction with the `external` property:
|
||||
It can also be used in conjunction with the `external` property:
|
||||
|
||||
version: '2.1'
|
||||
networks:
|
||||
|
|
|
|||
|
|
@ -1409,7 +1409,7 @@ networks:
|
|||
Sets the PID mode to the host PID mode. This turns on sharing between
|
||||
container and the host operating system the PID address space. Containers
|
||||
launched with this flag can access and manipulate other
|
||||
containers in the bare-metal machine's namespace and vise-versa.
|
||||
containers in the bare-metal machine's namespace and vice versa.
|
||||
|
||||
### ports
|
||||
|
||||
|
|
@ -2029,7 +2029,7 @@ and will **not** be scoped with the stack name.
|
|||
data:
|
||||
name: my-app-data
|
||||
|
||||
It can also be used in conjuction with the `external` property:
|
||||
It can also be used in conjunction with the `external` property:
|
||||
|
||||
version: '3.4'
|
||||
volumes:
|
||||
|
|
@ -2257,7 +2257,7 @@ and will **not** be scoped with the stack name.
|
|||
network1:
|
||||
name: my-app-net
|
||||
|
||||
It can also be used in conjuction with the `external` property:
|
||||
It can also be used in conjunction with the `external` property:
|
||||
|
||||
version: '3.5'
|
||||
networks:
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ replaces the old value.
|
|||
> `build` and `image` in Compose file version 1
|
||||
>
|
||||
> In the case of `build` and `image`, when using
|
||||
> [version 1 of the Compose file format](compose-file.md#version-1), using one
|
||||
> [version 1 of the Compose file format](/compose/compose-file/compose-file-v1.md), using one
|
||||
> option in the local service causes Compose to discard the other option if it
|
||||
> was defined in the original service.
|
||||
>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ by step instructions are also included below.
|
|||
1. Run this command to download the latest version of Docker Compose:
|
||||
|
||||
```bash
|
||||
sudo curl -L https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
|
||||
sudo curl -L "https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
|
||||
```
|
||||
|
||||
> Use the latest Compose release number in the download command.
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ web_1 | A server is already
|
|||
running. Check /myapp/tmp/pids/server.pid.
|
||||
```
|
||||
|
||||
To resolve this, delete the file `tmp/pids/server.pid`, and then re-start the
|
||||
To resolve this, delete the file `tmp/pids/server.pid`, and then restart the
|
||||
application with `docker-compose up`.
|
||||
|
||||
### Restart the application
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ Options:
|
|||
--pull Always attempt to pull a newer version of the image.
|
||||
-m, --memory MEM Sets memory limit for the build container.
|
||||
--build-arg key=val Set build-time variables for services.
|
||||
--parallel Build images in parallel.
|
||||
```
|
||||
|
||||
Services are built once and then tagged, by default as `project_service`. For
|
||||
|
|
|
|||
|
|
@ -10,10 +10,12 @@ Usage: config [options]
|
|||
|
||||
Options:
|
||||
--resolve-image-digests Pin image tags to digests.
|
||||
-q, --quiet Only validate the configuration, don't print
|
||||
anything.
|
||||
-q, --quiet Only validate the configuration – do not print anything.
|
||||
--services Print the service names, one per line.
|
||||
--volumes Print the volume names, one per line.
|
||||
--hash="*" Print the service config hash, one per line.
|
||||
Set "service1,service2" for a list of specified services
|
||||
or use the wildcard symbol to display all services.
|
||||
```
|
||||
|
||||
Validate and view the Compose file.
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ script:
|
|||
check. For example, you might want to wait until Postgres is definitely
|
||||
ready to accept commands:
|
||||
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
# wait-for-postgres.sh
|
||||
|
||||
set -e
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ When you connect an existing container to a different network using
|
|||
`docker network connect`, you can use the `--ip` or `--ip6` flags on that
|
||||
command to specify the container's IP address on the additional network.
|
||||
|
||||
In the same way, a container's hostname defaults to be the container's name in
|
||||
In the same way, a container's hostname defaults to be the container's ID in
|
||||
Docker. You can override the hostname using `--hostname`. When connecting to an
|
||||
existing network using `docker network connect`, you can use the `--alias`
|
||||
flag to specify an additional network alias for the container on that network.
|
||||
|
|
@ -65,7 +65,7 @@ settings on a per-container basis.
|
|||
| `--dns` | The IP address of a DNS server. To specify multiple DNS servers, use multiple `--dns` flags. If the container cannot reach any of the IP addresses you specify, Google's public DNS server `8.8.8.8` is added, so that your container can resolve internet domains. |
|
||||
| `--dns-search` | A DNS search domain to search non-fully-qualified hostnames. To specify multiple DNS search prefixes, use multiple `--dns-search` flags. |
|
||||
| `--dns-opt` | A key-value pair representing a DNS option and its value. See your operating system's documentation for `resolv.conf` for valid options. |
|
||||
| `--hostname` | The hostname a container uses for itself. Defaults to the container's name if not specified. |
|
||||
| `--hostname` | The hostname a container uses for itself. Defaults to the container's ID if not specified. |
|
||||
|
||||
## Proxy server
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ driver options.
|
|||
| Option | Required | Description |
|
||||
|:------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| `tag` | optional | Specify template to set `CONTAINER_TAG` and `SYSLOG_IDENTIFIER` value in journald logs. Refer to [log tag option documentation](/engine/admin/logging/log_tags/) to customize the log tag format |
|
||||
| `label` | optional | Comma-separated list of keys of labels, which should be included in message, if these labels are specified for the container. |
|
||||
| `labels` | optional | Comma-separated list of keys of labels, which should be included in message, if these labels are specified for the container. |
|
||||
| `env` | optional | Comma-separated list of keys of environment variables, which should be included in message, if these variables are specified for the container. |
|
||||
| `env-regex` | optional | Similar to and compatible with env. A regular expression to match logging-related environment variables. Used for advanced [log tag options](/engine/admin/logging/log_tags/). |
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ The following properties let you configure the splunk logging driver.
|
|||
|
||||
- To configure the `splunk` driver across the Docker environment, edit
|
||||
`daemon.json` with the key, `"log-opts": {"NAME": "VALUE", ...}`.
|
||||
- To configure the `splunk` driver for an indiviual container, use `docker run`
|
||||
- To configure the `splunk` driver for an individual container, use `docker run`
|
||||
with the flag, `--log-opt NAME=VALUE ...`.
|
||||
|
||||
| Option | Required | Description |
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ keywords: "docker, daemon, configuration"
|
|||
|
||||
By default, a container has no resource constraints and can use as much of a
|
||||
given resource as the host's kernel scheduler allows. Docker provides ways
|
||||
to control how much memory, CPU, or block IO a container can use, setting runtime
|
||||
to control how much memory, or CPU a container can use, setting runtime
|
||||
configuration flags of the `docker run` command. This section provides details
|
||||
on when you should set such limits and the possible implications of setting them.
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ is ensuring you're running DTR 2.0. If that's not the case, start by upgrading
|
|||
your installation to version 2.0.0, and then upgrade to the latest version
|
||||
available.
|
||||
|
||||
There is no downtime when upgrading an highly-available DTR cluster. If your
|
||||
There is no downtime when upgrading a highly-available DTR cluster. If your
|
||||
DTR deployment has a single replica, schedule the upgrade to take place outside
|
||||
business peak hours to ensure the impact on your business is close to none.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ is ensuring you're running DTR 2.0. If that's not the case, start by upgrading
|
|||
your installation to version 2.0.0, and then upgrade to the latest version
|
||||
available.
|
||||
|
||||
There is no downtime when upgrading an highly-available DTR cluster. If your
|
||||
There is no downtime when upgrading a highly-available DTR cluster. If your
|
||||
DTR deployment has a single replica, schedule the upgrade to take place outside
|
||||
business peak hours to ensure the impact on your business is close to none.
|
||||
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Start by
|
|||
Then, as a best practice you should
|
||||
[create a new IAM user](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_create.html)
|
||||
just for the DTR
|
||||
integration and apply a IAM policy that ensures the user has limited permissions.
|
||||
integration and apply an IAM policy that ensures the user has limited permissions.
|
||||
|
||||
This user only needs permissions to access the bucket that you use to store
|
||||
images, and to read, write, and delete files.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ pushes will fail
|
|||
|
||||
The GC cron schedule is set to run in **UTC time**. Containers typically run in
|
||||
UTC time (unless the system time is mounted), therefore remember that the cron
|
||||
schedule will run based off of UTC time when configuring.
|
||||
schedule will run based on UTC time when configuring.
|
||||
|
||||
GC puts DTR into read-only mode; pulls succeed while pushes fail. Pushing an
|
||||
image while GC runs may lead to undefined behavior and data loss, therefore
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ Jobs can be in one of the following status:
|
|||
|
||||
## Job capacity
|
||||
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require an
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require a
|
||||
higher capacity. You can see the capacity of a job runner using the
|
||||
`GET /api/v0/workers` endpoint:
|
||||
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ with more details on any one of these services:
|
|||
* Content trust (notary)
|
||||
|
||||
This endpoint is for checking the health of a *single* replica. To get
|
||||
the health of every replica in a cluster, querying each replica individiually is
|
||||
the health of every replica in a cluster, querying each replica individually is
|
||||
the preferred way to do it in real time.
|
||||
|
||||
The `/api/v0/meta/cluster_status`
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ Jobs can be in one of the following status:
|
|||
|
||||
## Job capacity
|
||||
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require an
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require a
|
||||
higher capacity. You can see the capacity of a job runner using the
|
||||
`GET /api/v0/workers` endpoint:
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,18 @@ known issues for each DTR version.
|
|||
You can then use [the upgrade instructions](admin/upgrade.md),
|
||||
to upgrade your installation to the latest release.
|
||||
|
||||
## Version 2.3.9
|
||||
|
||||
(25 October 2018)
|
||||
|
||||
### Bug Fixes
|
||||
* Added CSP (Content Security Policy). (docker/dhe-deploy#9368 and docker/dhe-deploy#9588)
|
||||
* Fixed critical vulnerability in RethinkDB. (docker/dhe-deploy#9575)
|
||||
|
||||
### Changelog
|
||||
* Patched security vulnerabilities in the load balancer.
|
||||
* Patch packages and base OS to eliminate and address some critical vulnerabilities in DTR dependencies.
|
||||
|
||||
## Version 2.3.8
|
||||
|
||||
(26 July 2018)
|
||||
|
|
|
|||
|
|
@ -97,5 +97,5 @@ pipelines.
|
|||
Also, users don't need access to all repositories in the promotion pipeline.
|
||||
A repository admin can define the promotion policies, and only
|
||||
allow access to push to the first repository in that pipeline. Once users push
|
||||
to the fist repository, the image gets promoted to the other repositories as
|
||||
to the first repository, the image gets promoted to the other repositories as
|
||||
long as it satisfies the promotion policies.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ need to do the same procedure for every one of them.
|
|||
### Configure your Notary client
|
||||
|
||||
Start by [configuring your Notary client](../../access-dtr/configure-your-notary-client.md).
|
||||
This ensures the Docker an Notary CLI clients know about your UCP private keys.
|
||||
This ensures the Docker and Notary CLI clients know about your UCP private keys.
|
||||
|
||||
### Initialize the trust metadata
|
||||
|
||||
|
|
|
|||
|
|
@ -2132,7 +2132,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12457,7 +12457,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13877,7 +13877,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26083,7 +26083,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ Note: Use --ucp-ca "$(cat ca.pem)" instead of --ucp-insecure-tls for a productio
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to.The endpoint to send logs to. Use this flag if you set --log-protocol to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>.By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--overlay-subnet` | $DTR_OVERLAY_SUBNET | The subnet used by the dtr-ol overlay network. Example: 10.0.0.0/24.For high-availalibity, DTR creates an overlay network between UCP nodes. This flag allows you to choose the subnet for that network. Make sure the subnet you choose is not used on any machine where DTR replicas are deployed. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80.This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with --replica-https-port. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443.This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ time, configure your DTR for high-availability.
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to. The endpoint to send logs to. Use this flag if you set `--log-protocol` to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal. This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with `--log-host`. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal. This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with `--log-host`. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>. By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for. When using `--http-proxy` you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for. When using `--http-proxy` you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80. This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with `--replica-https-port`. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443. This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
| `--ucp-ca` | $UCP_CA | Use a PEM-encoded TLS CA certificate for UCP. Download the UCP TLS CA certificate from https://<ucp-url>/ca, and use --ucp-ca "$(cat ca.pem)". |
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ restore procedure for the Docker images stored in your registry, taking in
|
|||
consideration whether your DTR installation is configured to store images on
|
||||
the local filesystem or using a cloud provider.
|
||||
|
||||
After restoring, you can add more DTR replicas by using the the 'join' command.
|
||||
After restoring, you can add more DTR replicas by using the 'join' command.
|
||||
|
||||
|
||||
## Options
|
||||
|
|
@ -46,9 +46,9 @@ After restoring, you can add more DTR replicas by using the the 'join' command.
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to.The endpoint to send logs to. Use this flag if you set --log-protocol to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>.By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80.This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with --replica-https-port. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443.This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
| `--replica-id` | $DTR_INSTALL_REPLICA_ID | Assign an ID to the DTR replica. Random by default. |
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ with more details on any one of these services:
|
|||
* Content trust (notary)
|
||||
|
||||
This endpoint is for checking the health of a *single* replica. To get
|
||||
the health of every replica in a cluster, querying each replica individiually is
|
||||
the health of every replica in a cluster, querying each replica individually is
|
||||
the preferred way to do it in real time.
|
||||
|
||||
The `/api/v0/meta/cluster_status`
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ Jobs can be in one of the following status:
|
|||
|
||||
## Job capacity
|
||||
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require an
|
||||
higher capacity. You can see the capacity of a job runner using the
|
||||
Each job runner has a limited capacity and doesn't claim jobs that require a
|
||||
higher capacity. You can see the capacity of a job runner using the
|
||||
`GET /api/v0/workers` endpoint:
|
||||
|
||||
```json
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ Note: Use --ucp-ca "$(cat ca.pem)" instead of --ucp-insecure-tls for a productio
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to.The endpoint to send logs to. Use this flag if you set --log-protocol to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>.By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--overlay-subnet` | $DTR_OVERLAY_SUBNET | The subnet used by the dtr-ol overlay network. Example: 10.0.0.0/24.For high-availalibity, DTR creates an overlay network between UCP nodes. This flag allows you to choose the subnet for that network. Make sure the subnet you choose is not used on any machine where DTR replicas are deployed. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80.This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with --replica-https-port. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443.This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ time, configure your DTR for high-availability.
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to.The endpoint to send logs to. Use this flag if you set --log-protocol to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>.By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80.This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with --replica-https-port. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443.This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
| `--ucp-ca` | $UCP_CA | Use a PEM-encoded TLS CA certificate for UCP.Download the UCP TLS CA certificate from https://<ucp-url>/ca, and use --ucp-ca "$(cat ca.pem)". |
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ restore procedure for the Docker images stored in your registry, taking in
|
|||
consideration whether your DTR installation is configured to store images on
|
||||
the local filesystem or using a cloud provider.
|
||||
|
||||
After restoring, you can add more DTR replicas by using the the 'join' command.
|
||||
After restoring, you can add more DTR replicas by using the 'join' command.
|
||||
|
||||
|
||||
## Options
|
||||
|
|
@ -43,9 +43,9 @@ After restoring, you can add more DTR replicas by using the the 'join' command.
|
|||
| `--https-proxy` | $DTR_HTTPS_PROXY | The HTTPS proxy used for outgoing requests. |
|
||||
| `--log-host` | $LOG_HOST | Where to send logs to.The endpoint to send logs to. Use this flag if you set --log-protocol to tcp or udp. |
|
||||
| `--log-level` | $LOG_LEVEL | Log level for all container logs when logging to syslog. Default: INFO. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocals are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--log-protocol` | $LOG_PROTOCOL | The protocol for sending logs. Default is internal.This allows to define the protocol used to send container logs to an external system. The supported protocols are tcp, udp, or internal. Use this flag with --log-host. |
|
||||
| `--nfs-storage-url` | $NFS_STORAGE_URL | NFS to store Docker images. Format nfs://<ip|hostname>/<mountpoint>.By default DTR creates a volume to store the Docker images in the local filesystem of the node where DTR is running, without high-availability. Use this flag to specify an NFS mount for DTR to store images, using the format nfs://<ip|hostname>/<mountpoint>. To use this flag, you need to install an NFS client library like nfs-common in the node where you're deploying DTR. You can test this by running showmount -e <nfs-server>. When you join new replicas, they will start using NFS so you don't need to use this flag. To reconfigure DTR to stop using NFS, leave this option empty. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route throught the proxy. Format acme.com[, acme.org]. |
|
||||
| `--no-proxy` | $DTR_NO_PROXY | List of domains the proxy should not be used for.When using --http-proxy you can use this flag to specify a list of domains that you don't want to route through the proxy. Format acme.com[, acme.org]. |
|
||||
| `--replica-http-port` | $REPLICA_HTTP_PORT | The public HTTP port for the DTR replica. Default is 80.This allows you to customize the HTTP port where users can reach DTR. Once users access the HTTP port, they are redirected to use an HTTPS connection, using the port specified with --replica-https-port. This port can also be used for unencrypted health checks. |
|
||||
| `--replica-https-port` | $REPLICA_HTTPS_PORT | The public HTTPS port for the DTR replica. Default is 443.This allows you to customize the HTTPS port where users can reach DTR. Each replica can use a different port. |
|
||||
| `--replica-id` | $DTR_INSTALL_REPLICA_ID | Assign an ID to the DTR replica. Random by default. |
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ title: Integrate with Docker Trusted Registry
|
|||
You can integrate UCP with Docker Trusted Registry (DTR). This allows you to
|
||||
securely store and manage the Docker images that are used in your UCP cluster.
|
||||
|
||||
At an high-level, there are three steps to integrate UCP with DTR:
|
||||
At a high-level, there are three steps to integrate UCP with DTR:
|
||||
|
||||
* Configure UCP to know about DTR,
|
||||
* Configure DTR to trust UCP,
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ To enable the networking feature, do the following.
|
|||
|
||||
5. Restart the Engine `daemon`.
|
||||
|
||||
The Engine `daemon` is a OS service process running on each node in your
|
||||
The Engine `daemon` is an OS service process running on each node in your
|
||||
cluster. How you restart a service is operating-system dependent. Some
|
||||
examples appear below but keep in mind that on your system, the restart
|
||||
operation may differ. Check with your system administrator if you are not
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ in the cluster. There are four permission levels:
|
|||
| `No Access` | The user can't view any resource, like volumes, networks, images, or containers. |
|
||||
| `View Only` | The user can view volumes, networks and images, but can't create any containers. |
|
||||
| `Restricted Control` | The user can view and edit volumes, networks, and images. They can create containers, but can't see other users containers, run `docker exec`, or run containers that require privileged access to the host. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images, They can create containers without any restriction, but can't see other users containers. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images. They can create containers without any restriction, but can't see other users containers. |
|
||||
|
||||
[Learn more about the UCP permission levels](permission-levels.md). Finally,
|
||||
click the **Create User** button, to create the user.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ access to full control over the resources.
|
|||
| `No Access` | The user can't view any resource, like volumes, networks, images, or containers. |
|
||||
| `View Only` | The user can view volumes, networks and images, but can't create any containers. |
|
||||
| `Restricted Control` | The user can view and edit volumes, networks, and images. They can create containers, but can't see other users containers, run `docker exec`, or run containers that require privileged access to the host. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images, They can create containers without any restriction, but can't see other users containers. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images. They can create containers without any restriction, but can't see other users containers. |
|
||||
|
||||
When a user only has a default permission assigned, only them and admin
|
||||
users can see the containers they deploy in the cluster.
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ user certificates:
|
|||
$ notary delegation add -p <dtr_url>/<account>/<repository> targets/releases --all-paths user1.pem user2.pem
|
||||
```
|
||||
|
||||
The above command adds the the `targets/releases` delegation role to a trusted
|
||||
The above command adds the `targets/releases` delegation role to a trusted
|
||||
repository.
|
||||
This role is treated as an actual release branch for Docker Content Trust,
|
||||
since `docker pull` commands with trust enabled will pull directly from this
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ you use the [docker swarm join](/engine/swarm/swarm-tutorial/add-nodes.md)
|
|||
command to add more nodes to your cluster. When joining new nodes, the UCP
|
||||
services automatically start running in that node.
|
||||
|
||||
When joining a node a a cluster you can specify its role: manager or worker.
|
||||
When joining a node a cluster you can specify its role: manager or worker.
|
||||
|
||||
* **Manager nodes**
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ access to full control over the resources.
|
|||
| `No Access` | The user can't view any resource, like volumes, networks, images, or containers. |
|
||||
| `View Only` | The user can view volumes, networks and images, but can't create any containers. |
|
||||
| `Restricted Control` | The user can view and edit volumes, networks, and images. They can create containers, but can't see other users containers, run `docker exec`, or run containers that require privileged access to the host. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images, They can create containers without any restriction, but can't see other users containers. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images. They can create containers without any restriction, but can't see other users containers. |
|
||||
|
||||
When a user only has a default permission assigned, only them and admin
|
||||
users can see the containers they deploy in the cluster.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ access to full control over the resources.
|
|||
| `No Access` | The user can't view any resource, like volumes, networks, images, or containers. |
|
||||
| `View Only` | The user can view volumes, networks, and images, but can't create any containers. |
|
||||
| `Restricted Control` | The user can view and edit volumes, networks, and images. They can create containers, but can't see other users' containers, run `docker exec`, or run containers that require privileged access to the host. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images, They can create containers without any restriction, but can't see other users' containers. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images. They can create containers without any restriction, but can't see other users' containers. |
|
||||
|
||||
If a user has Restricted Control or Full Control default permissions, they can create resources without labels, and only the user and Admins can see and access the resources. Default permissions also affect ability for a user to access things that can't have labels, images and nodes.
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ services with sensitive information like passwords, TLS certificates, or
|
|||
private keys.
|
||||
|
||||
Universal Control Plane allows you to store this sensitive information, also
|
||||
know as secrets, in a secure way. It also gives you role-based access control
|
||||
known as secrets, in a secure way. It also gives you role-based access control
|
||||
so that you can control which users can use a secret in their services
|
||||
and which ones can manage the secret.
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ The system provides the following default roles:
|
|||
| `View Only` | The user can view resources like services, volumes, and networks but can't create them. |
|
||||
| `Restricted Control` | The user can view and edit volumes, networks, and images but can't run a service or container in a way that might affect the node where it's running. The user can't mount a node directory and can't `exec` into containers. Also, The user can't run containers in privileged mode or with additional kernel capabilities. |
|
||||
| `Scheduler` | The user can view nodes and schedule workloads on them. Worker nodes and manager nodes are affected by `Scheduler` grants. Having `Scheduler` access doesn't allow the user to view workloads on these nodes. They need the appropriate resource permissions, like `Container View`. By default, all users get a grant with the `Scheduler` role against the `/Shared` collection. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images, They can create containers without any restriction, but can't see other users' containers. |
|
||||
| `Full Control` | The user can view and edit volumes, networks, and images. They can create containers without any restriction, but can't see other users' containers. |
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ Settings for syncing users.
|
|||
|
||||
## auth.ldap.admin_sync_opts (optional)
|
||||
|
||||
Settings for syncing system admininistrator users.
|
||||
Settings for syncing system administrator users.
|
||||
|
||||
| Parameter | Required | Description |
|
||||
|:-----------------------|:---------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
|
|
|
|||
|
|
@ -223,5 +223,5 @@ you can create an overlay network that contains the `com.docker.mesh.http` label
|
|||
docker network create -d overlay --label com.docker.ucp.mesh.http=true new-hrm-network
|
||||
```
|
||||
|
||||
If you're creating a a new HRM network you need to disable the HRM service first, or disable
|
||||
If you're creating a new HRM network you need to disable the HRM service first, or disable
|
||||
and enable the HRM service after you create the network else HRM will not be available on new network.
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -2121,7 +2121,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
|
|||
} else if (res && obj.on && obj.on.response) {
|
||||
var possibleObj;
|
||||
|
||||
// Already parsed by by superagent?
|
||||
// Already parsed by superagent?
|
||||
if(res.body && Object.keys(res.body).length > 0) {
|
||||
possibleObj = res.body;
|
||||
} else {
|
||||
|
|
@ -12442,7 +12442,7 @@ var iframe,
|
|||
elemdisplay = {};
|
||||
|
||||
/**
|
||||
* Retrieve the actual display of a element
|
||||
* Retrieve the actual display of an element
|
||||
* @param {String} name nodeName of the element
|
||||
* @param {Object} doc Document object
|
||||
*/
|
||||
|
|
@ -13862,7 +13862,7 @@ jQuery.fx.speeds = {
|
|||
};
|
||||
|
||||
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// Based on the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com/index.php/2009/07/jquery-delay/
|
||||
jQuery.fn.delay = function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
|
|
@ -26068,7 +26068,7 @@ var baseCreate = require('./baseCreate'),
|
|||
* @private
|
||||
* @param {*} value The value to wrap.
|
||||
* @param {boolean} [chainAll] Enable chaining for all wrapper methods.
|
||||
* @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
|
||||
* @param {Array} [actions=[]] Actions to perform to resolve the unwrapped value.
|
||||
*/
|
||||
function LodashWrapper(value, chainAll, actions) {
|
||||
this.__wrapped__ = value;
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@ description: Learn the new features of Docker Build
|
|||
keywords: build, security, engine, secret, buildkit
|
||||
---
|
||||
|
||||
> Beta disclaimer
|
||||
>
|
||||
> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice.
|
||||
|
||||
Docker Build is one of the most used features of the Docker Engine - users ranging from developers, build teams, and release teams all use Docker Build.
|
||||
|
||||
Docker Build enhancements for 18.09 release introduces a much-needed overhaul of the build architecture. By integrating BuildKit, users should see an improvement on performance, storage management, feature functionality, and security.
|
||||
|
|
@ -105,7 +101,7 @@ $ docker build --progress=plain .
|
|||
|
||||
To override the default frontend, set the first line of the Dockerfile as a comment with a specific frontend image:
|
||||
```
|
||||
# syntax = <frontend image>, e.g. # syntax = tonistiigi/dockerfile:secrets20180808
|
||||
# syntax = <frontend image>, e.g. # syntax = docker/dockerfile:1.0-experimental
|
||||
```
|
||||
|
||||
## New Docker Build secret information
|
||||
|
|
@ -122,11 +118,11 @@ For example, with a secret piece of information stored in a text file:
|
|||
$ echo 'WARMACHINEROX' > mysecret.txt
|
||||
```
|
||||
|
||||
And with a Dockerfile that specifies use of a buildkit frontend `dockerfile:secrets20180828`, the secret can be accessed.
|
||||
And with a Dockerfile that specifies use of a buildkit frontend `docker/dockerfile:1.0-experimental`, the secret can be accessed.
|
||||
|
||||
For example:
|
||||
```
|
||||
# syntax = dockerfile:secrets20180828
|
||||
# syntax = docker/dockerfile:1.0-experimental
|
||||
FROM alpine
|
||||
RUN --mount=type=secret,id=mysecret cat /run/secrets/mysecret # shows secret from default secret location
|
||||
RUN --mount=type=secret,id=mysecret,dst=/foobar cat /foobar # shows secret from custom secret location
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ to an Organization, the Cancel and Retry buttons only appear if you have `Read &
|
|||
|
||||
Automated builds are enabled per branch or tag, and can be disabled and
|
||||
re-enabled easily. You might do this when you want to only build manually for
|
||||
awhile, for example when you are doing major refactoring in your code. Disabling
|
||||
a while, for example when you are doing major refactoring in your code. Disabling
|
||||
autobuilds does not disable [autotests](automated-testing.md).
|
||||
|
||||
To disable an automated build:
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ Learn how to [connect to a swarm through Docker Cloud](connect-to-swarm.md).
|
|||
|
||||
Learn how to [register existing swarms](register-swarms.md).
|
||||
|
||||
You can get an overivew of topics on [swarms in Docker Cloud](index.md).
|
||||
You can get an overview of topics on [swarms in Docker Cloud](index.md).
|
||||
|
||||
To find out more about Docker swarm in general, see the Docker engine
|
||||
[Swarm Mode overview](/engine/swarm/).
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ Learn how to [connect to a swarm through Docker Cloud](connect-to-swarm.md).
|
|||
|
||||
Learn how to [register existing swarms](register-swarms.md).
|
||||
|
||||
You can get an overivew of topics on [swarms in Docker Cloud](index.md).
|
||||
You can get an overview of topics on [swarms in Docker Cloud](index.md).
|
||||
|
||||
To find out more about Docker swarm in general, see the Docker engine
|
||||
[Swarm Mode overview](/engine/swarm/).
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ You need an SSH key to provide to Docker Cloud during the swarm create
|
|||
process. If you haven't done so yet, check out how to [Set up SSH
|
||||
keys](ssh-key-setup.md).
|
||||
|
||||
You can get an overivew of topics on [swarms in Docker Cloud](index.md).
|
||||
You can get an overview of topics on [swarms in Docker Cloud](index.md).
|
||||
|
||||
**Using Standard Mode to managing Docker nodes on Azure?** If you are
|
||||
setting up nodes on Azure in [Standard Mode](/docker-cloud/standard/),
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ EOF
|
|||
|
||||
For a complete description of the parameters in an ECS task definition, please refer to the [documentation](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html).
|
||||
|
||||
If you've already written a Docker compose file for your service, you can import it as an ECS task definition using the `ecs-cli`, a purpose-built CLI for interacting with the ECS APIs. It's also possible to create a ECS service directly from a Docker compose file. The following is an example of a docker compose file for the `db` service.
|
||||
If you've already written a Docker compose file for your service, you can import it as an ECS task definition using the `ecs-cli`, a purpose-built CLI for interacting with the ECS APIs. It's also possible to create an ECS service directly from a Docker compose file. The following is an example of a docker compose file for the `db` service.
|
||||
|
||||
```
|
||||
version: '2'
|
||||
|
|
@ -207,7 +207,7 @@ When you're ready to register the task definition, execute the following command
|
|||
```
|
||||
aws ecs register-task-definition --cli-input-json file://db-taskdef.json
|
||||
```
|
||||
Now that we've created a task definition for the Postgres database, we need to create a ECS service. When you create a service, the tasks are automatically monitored by the ECS scheduler which will restart tasks when they fail in order to maintain your desired state. With ECS, you can also associate a name with your service in Route 53 so other services can discover it by querying DNS. For this service, you're going to create an A record.
|
||||
Now that we've created a task definition for the Postgres database, we need to create an ECS service. When you create a service, the tasks are automatically monitored by the ECS scheduler which will restart tasks when they fail in order to maintain your desired state. With ECS, you can also associate a name with your service in Route 53 so other services can discover it by querying DNS. For this service, you're going to create an A record.
|
||||
|
||||
The first step involves creating a namespace for our `db` service, for example, `corp.local`. The following command creates a private hosted zone in Route 53 that will be used for our namespace.
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ Register the task definition.
|
|||
aws ecs register-task-definition --region <region> --cli-input-json file://redis-taskdef.json
|
||||
```
|
||||
|
||||
This task definition will create a ECS task that runs a `redis:alpine` container that listens on port 6379.
|
||||
This task definition will create an ECS task that runs a `redis:alpine` container that listens on port 6379.
|
||||
|
||||
Register the `redis:alpine` service with the service discovery service. This will create a A record in a Route 53 private hosted zone that other services will use for service discovery.
|
||||
|
||||
|
|
|
|||
|
|
@ -694,7 +694,7 @@ Save the Kubernetes manifest file (as `k8s-vote.yml`) and check it into version
|
|||
|
||||
## Test the app on AKS
|
||||
|
||||
Before migrating, you should thoroughly test each new Kubernetes manifest on a AKS cluster. Healthy testing includes _deploying_ the application with the new manifest file, performing _scaling_ operations, increasing _load_, running _failure_ scenarios, and doing _updates_ and _rollbacks_. These tests are specific to each of your applications. You should also manage your manifest files in a version control system.
|
||||
Before migrating, you should thoroughly test each new Kubernetes manifest on an AKS cluster. Healthy testing includes _deploying_ the application with the new manifest file, performing _scaling_ operations, increasing _load_, running _failure_ scenarios, and doing _updates_ and _rollbacks_. These tests are specific to each of your applications. You should also manage your manifest files in a version control system.
|
||||
|
||||
The following steps explain how to deploy your app from the Kubernetes manifest file and verify that it is running. The steps are based on the sample application used throughout this guide, but the general commands should work for any app.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ title: Docker for Azure Release Notes
|
|||
## Enterprise Edition
|
||||
[Docker Enterprise Edition Lifecycle](https://success.docker.com/Policies/Maintenance_Lifecycle){: target="_blank"}<!--_-->
|
||||
|
||||
[Deploy Docker Enterprise Edition (EE) for AWS](https://store.docker.com/editions/enterprise/docker-ee-aws?tab=description){: target="_blank" class="button outline-btn"}
|
||||
[Deploy Docker Enterprise Edition (EE) for Azure](https://store.docker.com/editions/enterprise/docker-ee-azure?tab=description){: target="_blank" class="button outline-btn"}
|
||||
|
||||
### 17.06 EE
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,24 @@ for Mac](install.md#download-docker-for-mac).
|
|||
|
||||
## Edge Releases of 2018
|
||||
|
||||
### Docker Community Edition 2.0.0.0-beta1-mac75 2018-09-14
|
||||
|
||||
[Download](https://download.docker.com/mac/edge/27117/Docker.dmg)
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.0-ce-beta1](https://github.com/docker/docker-ce/releases/tag/v18.09.0-ce-beta1)
|
||||
- Linux Kernel 4.9.125
|
||||
|
||||
* New
|
||||
- New version scheme
|
||||
|
||||
* Deprecation
|
||||
- Removed support of AUFS
|
||||
- Removed support of OSX 10.11
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix panic in diagnose
|
||||
|
||||
### Docker Community Edition 18.06.1-ce-mac74 2018-08-29
|
||||
|
||||
[Download](https://download.docker.com/mac/edge/26766/Docker.dmg)
|
||||
|
|
@ -105,7 +123,7 @@ for Mac](install.md#download-docker-for-mac).
|
|||
- [Notary 0.6.1](https://github.com/docker/notary/releases/tag/v0.6.1)
|
||||
|
||||
* New
|
||||
- Re-enable raw as the the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
- Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix Docker for Mac not starting due to socket file paths being too long (typically HOME folder path being too long). Fixes [docker/for-mac#2727](https://github.com/docker/for-mac/issues/2727), [docker/for-mac#2731](https://github.com/docker/for-mac/issues/2731).
|
||||
|
|
@ -221,7 +239,7 @@ for Mac](install.md#download-docker-for-mac).
|
|||
|
||||
* Bug fixes and minor changes
|
||||
- Added "Restart" menu item. See [docker/for-mac#2407](https://github.com/docker/for-mac/issues/2407)
|
||||
- Keep any existing kubectl binary when activating Kubenetes in Docker for Mac, and restore it when disabling Kubernetes. Fixes [docker/for-mac#2508](https://github.com/docker/for-mac/issues/2508), [docker/for-mac#2368](https://github.com/docker/for-mac/issues/2368)
|
||||
- Keep any existing kubectl binary when activating Kubernetes in Docker for Mac, and restore it when disabling Kubernetes. Fixes [docker/for-mac#2508](https://github.com/docker/for-mac/issues/2508), [docker/for-mac#2368](https://github.com/docker/for-mac/issues/2368)
|
||||
- Fix Kubernetes context selector. Fixes [docker/for-mac#2495](https://github.com/docker/for-mac/issues/2495)
|
||||
|
||||
### Docker Community Edition 18.01.0-ce-mac48 2018-01-19
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 375 KiB After Width: | Height: | Size: 132 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 245 KiB After Width: | Height: | Size: 128 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 125 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 112 KiB |
|
|
@ -18,11 +18,14 @@ Welcome to Docker for Mac! Docker is a full development platform for creating
|
|||
containerized apps, and Docker for Mac is the best way to get started with
|
||||
Docker _on a Mac_.
|
||||
|
||||
> See [Install Docker for Mac](install.md){: target="_blank" class="_"} for information on system requirements and stable & edge channels.
|
||||
> See [Install Docker for Mac](install.md){: target="_blank" class="_"} for
|
||||
> information on system requirements and stable & edge channels.
|
||||
|
||||
## Check versions
|
||||
|
||||
Ensure your versions of `docker`, `docker-compose`, and `docker-machine` are up-to-date and compatible with `Docker.app`. Your output may differ if you are running different versions.
|
||||
Ensure your versions of `docker`, `docker-compose`, and `docker-machine` are
|
||||
up-to-date and compatible with `Docker.app`. Your output may differ if you are
|
||||
running different versions.
|
||||
|
||||
```shell
|
||||
$ docker --version
|
||||
|
|
@ -38,7 +41,9 @@ docker-machine version {{ site.machine_version }}, build 9ba6da9
|
|||
## Explore the application
|
||||
|
||||
1. Open a command-line terminal and test that your installation works by
|
||||
running the simple Docker image, [hello-world](https://hub.docker.com/_/hello-world/){: target="_blank" class="_"}:
|
||||
running the simple Docker image,
|
||||
[hello-world](https://hub.docker.com/_/hello-world/){: target="_blank"
|
||||
class="_"}:
|
||||
|
||||
```shell
|
||||
$ docker run hello-world
|
||||
|
|
@ -61,15 +66,18 @@ docker-machine version {{ site.machine_version }}, build 9ba6da9
|
|||
$ docker run -d -p 80:80 --name webserver nginx
|
||||
```
|
||||
|
||||
3. In a web browser, go to `http://localhost/` to view the nginx homepage. Because we specified the default HTTP port, it isn't necessary to append `:80` at the end of the URL.
|
||||
3. In a web browser, go to `http://localhost/` to view the nginx homepage.
|
||||
Because we specified the default HTTP port, it isn't necessary to append
|
||||
`:80` at the end of the URL.
|
||||
|
||||
{:width="500px"}
|
||||
|
||||
> Early beta releases used `docker` as the hostname to build the
|
||||
> URL. Now, ports are exposed on the private IP addresses of the VM and
|
||||
> forwarded to `localhost` with no other host name set.
|
||||
> Early beta releases used `docker` as the hostname to build the URL. Now,
|
||||
> ports are exposed on the private IP addresses of the VM and forwarded to
|
||||
> `localhost` with no other host name set.
|
||||
|
||||
4. View the details on the container while your web server is running (with `docker container ls` or `docker ps`):
|
||||
4. View the details on the container while your web server is running (with
|
||||
`docker container ls` or `docker ps`):
|
||||
|
||||
```none
|
||||
$ docker container ls
|
||||
|
|
@ -77,7 +85,8 @@ docker-machine version {{ site.machine_version }}, build 9ba6da9
|
|||
56f433965490 nginx "nginx -g 'daemon off" About a minute ago Up About a minute 0.0.0.0:80->80/tcp, 443/tcp webserver
|
||||
```
|
||||
|
||||
5. Stop and remove containers and images with the following commands. Use the "all" flag (`--all` or `-a`) to view stopped containers.
|
||||
5. Stop and remove containers and images with the following commands. Use the
|
||||
"all" flag (`--all` or `-a`) to view stopped containers.
|
||||
|
||||
```shell
|
||||
$ docker container ls
|
||||
|
|
@ -90,7 +99,8 @@ docker-machine version {{ site.machine_version }}, build 9ba6da9
|
|||
|
||||
## Preferences menu
|
||||
|
||||
Choose {: .inline} -> **Preferences** from the menu bar and configure the runtime options described below.
|
||||
Choose {: .inline} → **Preferences** from the
|
||||
menu bar and configure the runtime options described below.
|
||||
|
||||
{:width="250px"}
|
||||
|
||||
|
|
@ -100,18 +110,24 @@ Choose {: .inline} -> **Preferences** from the
|
|||
|
||||
General settings are:
|
||||
|
||||
- **Start Docker when you log in**: Uncheck this option if you don't want Docker to start when you open your session.
|
||||
- **Start Docker when you log in**: Uncheck this option if you don't want Docker
|
||||
to start when you open your session.
|
||||
|
||||
- **Automatically check for updates** notifies you when an update is available.
|
||||
Click **OK** to accept and install updates (or cancel to keep the current
|
||||
version). If you disable this option, you can still find out about updates
|
||||
manually by choosing {: .inline} -> **Check for Updates**.
|
||||
manually by choosing {: .inline} → **Check
|
||||
for Updates**.
|
||||
|
||||
- **Include VM in Time Machine backups** backs up the Docker for Mac virtual machine. (Disabled by default.)
|
||||
- **Include VM in Time Machine backups** backs up the Docker for Mac virtual
|
||||
machine. (Disabled by default.)
|
||||
|
||||
- **Securely store Docker logins in MacOS keychain** stores your Docker login credentials. (Enabled by default.)
|
||||
- **Securely store Docker logins in MacOS keychain** stores your Docker login
|
||||
credentials. (Enabled by default.)
|
||||
|
||||
- **Send usage statistics** — Send diagnostics, crash reports, and usage data to Docker. This information helps Docker improve the application and get more context for troubleshooting problems. (Enabled by default.)
|
||||
- **Send usage statistics** — Send diagnostics, crash reports, and usage
|
||||
data to Docker. This information helps Docker improve the application and get
|
||||
more context for troubleshooting problems. (Enabled by default.)
|
||||
|
||||
### File sharing
|
||||
|
||||
|
|
@ -127,7 +143,8 @@ File share settings are:
|
|||
|
||||
- **Add a Directory**: Click `+` and navigate to the directory you want to add.
|
||||
|
||||
- **Apply & Restart** makes the directory available to containers using Docker's bind mount (`-v`) feature.
|
||||
- **Apply & Restart** makes the directory available to containers using Docker's
|
||||
bind mount (`-v`) feature.
|
||||
|
||||
There are some limitations on the directories that can be shared:
|
||||
|
||||
|
|
@ -136,30 +153,34 @@ File share settings are:
|
|||
|
||||
For more information, see:
|
||||
|
||||
- [Namespaces](osxfs.md#namespaces){: target="_blank" class="_"} in the topic on [osxfs file system sharing](osxfs.md).
|
||||
- [Volume mounting requires file sharing for any project directories outside of `/Users`](troubleshoot.md#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).)
|
||||
- [Namespaces](osxfs.md#namespaces){: target="_blank" class="_"} in the topic on
|
||||
[osxfs file system sharing](osxfs.md).
|
||||
- [Volume mounting requires file sharing for any project directories outside of
|
||||
`/Users`](troubleshoot.md#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).)
|
||||
|
||||
### Advanced
|
||||
|
||||
On the Advanced tab, you can limit resources available to Docker.
|
||||
|
||||
{:width="400px"}
|
||||
{:width="400px"}
|
||||
|
||||
Advanced settings are:
|
||||
|
||||
**CPUs**: By default, Docker for Mac is set to use half the number of processors available
|
||||
on the host machine. To increase processing power, set this to a higher number;
|
||||
to decrease, lower the number.
|
||||
**CPUs**: By default, Docker for Mac is set to use half the number of processors
|
||||
available on the host machine. To increase processing power, set this to a
|
||||
higher number; to decrease, lower the number.
|
||||
|
||||
**Memory**: By default, Docker for Mac is set to use `2` GB runtime memory, allocated from
|
||||
the total available memory on your Mac. To increase RAM, set this to a higher number;
|
||||
to decrease it, lower the number.
|
||||
**Memory**: By default, Docker for Mac is set to use `2` GB runtime memory,
|
||||
allocated from the total available memory on your Mac. To increase RAM, set this
|
||||
to a higher number; to decrease it, lower the number.
|
||||
|
||||
**Swap**: Configure swap file size as needed. The default is 1 GB.
|
||||
|
||||
### Disk
|
||||
|
||||
Specify the **Disk image location** of the Linux volume, where containers and images are stored.
|
||||
Specify the **Disk image location** of the Linux volume, where containers and
|
||||
images are stored.
|
||||
|
||||
You can also move the disk image location. If you attempt to move the disk image
|
||||
to a location that already has one, you get a prompt asking if you want to use
|
||||
|
|
@ -178,8 +199,8 @@ pulling containers.
|
|||
|
||||
{:width="600px"}
|
||||
|
||||
When you start a container, your proxy settings propagate into
|
||||
the containers. For example:
|
||||
When you start a container, your proxy settings propagate into the containers.
|
||||
For example:
|
||||
|
||||
```
|
||||
$ docker run -it alpine env
|
||||
|
|
@ -202,7 +223,8 @@ using [restart policies](/engine/reference/run/#restart-policies-restart).
|
|||
|
||||
### Daemon
|
||||
|
||||
You can configure options on the Docker daemon that determine how your containers run.
|
||||
You can configure options on the Docker daemon that determine how your
|
||||
containers run.
|
||||
|
||||
Select **Basic** to configure the daemon with interactive settings, or select
|
||||
**Advanced** to edit the JSON directly.
|
||||
|
|
@ -213,12 +235,18 @@ Select **Basic** to configure the daemon with interactive settings, or select
|
|||
#### Experimental features
|
||||
|
||||
Both Docker for Mac Stable and Edge releases have experimental features enabled
|
||||
on Docker Engine, as described [Docker Experimental Features README](https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md){: target="_blank" class="_"}. If you uncheck **experimental mode**, Docker for Mac uses the current generally available
|
||||
release of Docker Engine.
|
||||
on Docker Engine, as described [Docker Experimental Features
|
||||
README](https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md){:
|
||||
target="_blank" class="_"}. If you uncheck **experimental mode**, Docker for Mac
|
||||
uses the current generally available release of Docker Engine.
|
||||
|
||||
> Don't enable experimental features in production
|
||||
>
|
||||
> Experimental features are not appropriate for production environments or workloads. They are meant to be sandbox experiments for new ideas. Some experimental features may become incorporated into upcoming stable releases, but others may be modified or pulled from subsequent Edge releases, and never released on Stable.
|
||||
>Experimental features are not appropriate for production environments or
|
||||
>workloads. They are meant to be sandbox experiments for new ideas. Some
|
||||
>experimental features may become incorporated into upcoming stable releases,
|
||||
>but others may be modified or pulled from subsequent Edge releases, and never
|
||||
>released on Stable.
|
||||
|
||||
You can see whether you are running experimental mode at the command line. If
|
||||
`Experimental` is `true`, then Docker is running in experimental mode, as shown
|
||||
|
|
@ -231,30 +259,41 @@ true
|
|||
|
||||
#### Insecure registries
|
||||
|
||||
You can set up a custom and insecure [registry](/registry/introduction.md){: target="_blank" class="_"}
|
||||
to store your public or private images (instead of using [Docker Hub](https://hub.docker.com/){:target="_blank" class="_"}
|
||||
or [Docker Trusted Registry](/datacenter/dtr/2.1/guides/index.md)).
|
||||
Add URLs for your insecure registries and registry mirrors on which to host your images.
|
||||
You can set up a custom and insecure [registry](/registry/introduction.md){:
|
||||
target="_blank" class="_"} to store your public or private images (instead of
|
||||
using [Docker Hub](https://hub.docker.com/){:target="_blank" class="_"} or
|
||||
[Docker Trusted Registry](/datacenter/dtr/2.1/guides/index.md)). Add URLs for
|
||||
your insecure registries and registry mirrors on which to host your images.
|
||||
|
||||
See also:
|
||||
- [How do I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates){:target="_blank" class="_"}
|
||||
- [How do I add client certificates](faqs.md#how-do-i-client-certificates){:target="_blank" class="_"}
|
||||
- [How do I add custom CA
|
||||
certificates?](faqs.md#how-do-i-add-custom-ca-certificates){:target="_blank"
|
||||
class="_"}
|
||||
- [How do I add client
|
||||
certificates](faqs.md#how-do-i-client-certificates){:target="_blank"
|
||||
class="_"}
|
||||
|
||||
#### Daemon configuration file
|
||||
|
||||
Click the **Advanced** tab to configure the daemon from the JSON file. For a full
|
||||
list of options, see the Docker Engine [dockerd commandline reference](/engine/reference/commandline/dockerd.md){:target="_blank" class="_"}.
|
||||
Click the **Advanced** tab to configure the daemon from the JSON file. For a
|
||||
full list of options, see the Docker Engine [dockerd commandline
|
||||
reference](/engine/reference/commandline/dockerd.md){:target="_blank"
|
||||
class="_"}.
|
||||
|
||||
Click **Apply & Restart** to save your settings and reboot Docker. Or, to cancel
|
||||
changes, click another preference tab, then choose to discard or not apply changes when asked.
|
||||
changes, click another preference tab, then choose to discard or not apply
|
||||
changes when asked.
|
||||
|
||||
{:width="400px"}
|
||||
|
||||
### Kubernetes
|
||||
|
||||
Docker for Mac 17.12 CE (and higher) includes a standalone Kubernetes server
|
||||
that runs on your Mac, so that you can test deploying your Docker workloads on
|
||||
Kubernetes.
|
||||
In Docker for Mac [17.12 Edge
|
||||
(mac45)](/docker-for-mac/edge-relese-notes/#docker-community-edition-17120-ce-mac45-2018-01-05)
|
||||
and higher, and [18.06 Stable
|
||||
(mac70)](/docker-for-mac/release-notes/#docker-community-edition-18060-ce-mac70-2018-07-25)
|
||||
and higher, a standalone Kubernetes server is included that runs on your Mac, so
|
||||
that you can test deploying your Docker workloads on Kubernetes.
|
||||
|
||||
The Kubernetes client command, `kubectl`, is included and configured to connect
|
||||
to the local Kubernetes server. If you have `kubectl` already installed and
|
||||
|
|
@ -270,10 +309,13 @@ If you installed `kubectl` with Homebrew, or by some other method, and
|
|||
experience conflicts, remove `/usr/local/bin/kubectl`.
|
||||
|
||||
- To enable Kubernetes support and install a standalone instance of Kubernetes
|
||||
running as a Docker container, select **Enable Kubernetes** and click the
|
||||
**Apply** button.
|
||||
running as a Docker container, select **Enable Kubernetes**, choose the
|
||||
[default
|
||||
orchestrator](/docker-for-mac/kubernetes/#override-the-default-orchestrator)
|
||||
and click the **Apply** button.
|
||||
|
||||
{: .with-border width="400px"}
|
||||
{: .with-border
|
||||
width="400px"}
|
||||
|
||||
|
||||
An Internet connection is required. Images required to run the Kubernetes
|
||||
|
|
@ -283,29 +325,32 @@ experience conflicts, remove `/usr/local/bin/kubectl`.
|
|||
When Kubernetes is enabled and running, an additional status bar item displays
|
||||
at the bottom right of the Docker for Mac Preferences dialog.
|
||||
|
||||
{:width="400px"}
|
||||
{:width="400px"}
|
||||
|
||||
The status of Kubernetes shows in the Docker menu and the context points to `docker-for-desktop`.
|
||||
The status of Kubernetes shows in the Docker menu and the context points to
|
||||
`docker-for-desktop`.
|
||||
|
||||
{: .with-border width="400px"}
|
||||
{: .with-border
|
||||
width="400px"}
|
||||
|
||||
- By default, Kubernetes containers are hidden from commands like `docker
|
||||
service ls`, because managing them manually is not supported. To make them
|
||||
visible, select **Show system containers (advanced)** and click **Apply and restart**.
|
||||
Most users do not need this option.
|
||||
visible, select **Show system containers (advanced)** and click **Apply and
|
||||
restart**. Most users do not need this option.
|
||||
|
||||
- To disable Kubernetes support at any time, deselect **Enable Kubernetes**.
|
||||
The Kubernetes containers are stopped and removed, and the
|
||||
- To disable Kubernetes support at any time, deselect **Enable Kubernetes**. The
|
||||
Kubernetes containers are stopped and removed, and the
|
||||
`/usr/local/bin/kubectl` command is removed.
|
||||
|
||||
For more about using the Kubernetes integration with
|
||||
Docker for Mac, see [Deploy on Kubernetes](kubernetes.md){:target="_blank" class="_"}.
|
||||
For more about using the Kubernetes integration with Docker for Mac, see
|
||||
[Deploy on Kubernetes](kubernetes.md){:target="_blank" class="_"}.
|
||||
|
||||
### Reset
|
||||
|
||||
Select {: .inline} ->
|
||||
**Preferences** from the menu bar, then click **Reset** to reset factory
|
||||
defaults, restart the Docker daemon, or uninstall.
|
||||
Select {: .inline} -> **Preferences** from the
|
||||
menu bar, then click **Reset** to reset factory defaults, restart the Docker
|
||||
daemon, or uninstall.
|
||||
|
||||
{:width="400px"}
|
||||
|
||||
|
|
@ -313,27 +358,28 @@ Reset settings are:
|
|||
|
||||
* **Restart** - Select to restart the Docker daemon.
|
||||
|
||||
* **Remove all data** - This option removes/resets all Docker data _without_
|
||||
a reset to factory defaults (which would cause you to lose settings).
|
||||
* **Remove all data** - This option removes/resets all Docker data _without_ a
|
||||
reset to factory defaults (which would cause you to lose settings).
|
||||
|
||||
* **Reset to factory defaults** - Choose this option to reset all options on
|
||||
Docker for Mac to its initial state, the same as when it was first installed.
|
||||
|
||||
* **Uninstall** - Choose this option to remove Docker for Mac from your system.
|
||||
* **Uninstall** - Choose this option to remove Docker for Mac from your
|
||||
system.
|
||||
|
||||
> Uninstall Docker for Mac from the commandline
|
||||
>
|
||||
> To uninstall Docker from Mac from a terminal, run: `<DockerforMacPath> --uninstall`.
|
||||
> If your instance is installed in the default location, this command provides a
|
||||
> clean uninstall:
|
||||
>To uninstall Docker from Mac from a terminal, run: `<DockerforMacPath>
|
||||
>--uninstall`. If your instance is installed in the default location, this
|
||||
>command provides a clean uninstall:
|
||||
>
|
||||
> ```shell
|
||||
> $ /Applications/Docker.app/Contents/MacOS/Docker --uninstall
|
||||
> Docker is running, exiting...
|
||||
> Docker uninstalled successfully. You can move the Docker application to the trash.
|
||||
> ```
|
||||
> You might want to use the command-line uninstall if, for example, you find that
|
||||
> the app is non-functional, and you cannot uninstall it from the menu.
|
||||
>```shell
|
||||
>$ /Applications/Docker.app/Contents/MacOS/Docker --uninstall
|
||||
>Docker is running, exiting...
|
||||
>Docker uninstalled successfully. You can move the Docker application to the trash.
|
||||
>```
|
||||
>You might want to use the command-line uninstall if, for example, you find that
|
||||
>the app is non-functional, and you cannot uninstall it from the menu.
|
||||
|
||||
## Add TLS certificates
|
||||
|
||||
|
|
@ -343,15 +389,14 @@ registries) to your Docker daemon.
|
|||
|
||||
### Add custom CA certificates (server side)
|
||||
|
||||
All trusted CAs (root or intermediate) are supported.
|
||||
Docker for Mac creates a certificate bundle of all user-trusted CAs based on the
|
||||
Mac Keychain, and appends it to Moby trusted certificates. So if an enterprise
|
||||
SSL certificate is trusted by the user on the host, it is trusted by Docker
|
||||
for Mac.
|
||||
All trusted CAs (root or intermediate) are supported. Docker for Mac creates a
|
||||
certificate bundle of all user-trusted CAs based on the Mac Keychain, and
|
||||
appends it to Moby trusted certificates. So if an enterprise SSL certificate is
|
||||
trusted by the user on the host, it is trusted by Docker for Mac.
|
||||
|
||||
To manually add a custom, self-signed certificate, start by adding
|
||||
the certificate to the macOS keychain, which is picked up by Docker for
|
||||
Mac. Here is an example.
|
||||
To manually add a custom, self-signed certificate, start by adding the
|
||||
certificate to the macOS keychain, which is picked up by Docker for Mac. Here is
|
||||
an example.
|
||||
|
||||
```bash
|
||||
$ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt
|
||||
|
|
@ -364,14 +409,17 @@ than for all users), run this command instead:
|
|||
$ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt
|
||||
```
|
||||
|
||||
See also, [Directory structures for certificates](#directory-structures-for-certificates).
|
||||
See also, [Directory structures for
|
||||
certificates](#directory-structures-for-certificates).
|
||||
|
||||
> **Note:** You need to restart Docker for Mac after making any changes to
|
||||
the keychain or to the `~/.docker/certs.d` directory in order for
|
||||
the changes to take effect.
|
||||
> **Note:** You need to restart Docker for Mac after making any changes to the
|
||||
keychain or to the `~/.docker/certs.d` directory in order for the changes to
|
||||
take effect.
|
||||
|
||||
For a complete explanation of how to do this, see the blog post
|
||||
[Adding Self-signed Registry Certs to Docker & Docker for Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/){:target="_blank" class="_"}.
|
||||
For a complete explanation of how to do this, see the blog post [Adding
|
||||
Self-signed Registry Certs to Docker & Docker for
|
||||
Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/){:target="_blank"
|
||||
class="_"}.
|
||||
|
||||
### Add client certificates
|
||||
|
||||
|
|
@ -384,15 +432,14 @@ folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker
|
|||
for Mac `xhyve` virtual machine).
|
||||
|
||||
> * You need to restart Docker for Mac after making any changes to the keychain
|
||||
> or to the `~/.docker/certs.d` directory in order for the changes to take
|
||||
> effect.
|
||||
> or to the `~/.docker/certs.d` directory in order for the changes to take
|
||||
> effect.
|
||||
>
|
||||
> * The registry cannot be listed as an _insecure registry_ (see [Docker
|
||||
> Daemon](index.md#docker-daemon)). Docker for Mac ignores
|
||||
> certificates listed under insecure registries, and does not send client
|
||||
> certificates. Commands like `docker run` that attempt to pull from the
|
||||
> registry produce error messages on the command line, as well as on the
|
||||
> registry.
|
||||
> Daemon](index.md#docker-daemon)). Docker for Mac ignores certificates listed
|
||||
> under insecure registries, and does not send client certificates. Commands
|
||||
> like `docker run` that attempt to pull from the registry produce error
|
||||
> messages on the command line, as well as on the registry.
|
||||
|
||||
### Directory structures for certificates
|
||||
|
||||
|
|
@ -443,10 +490,11 @@ installed both in Bash and Zsh.
|
|||
|
||||
### Bash
|
||||
|
||||
Bash has [built-in support for completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1){:target="_blank" class="_"}
|
||||
To activate completion for Docker commands, these files need to be copied or
|
||||
symlinked to your `bash_completion.d/` directory. For example, if you installed
|
||||
bash via [Homebrew](http://brew.sh/):
|
||||
Bash has [built-in support for
|
||||
completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1){:target="_blank"
|
||||
class="_"} To activate completion for Docker commands, these files need to be
|
||||
copied or symlinked to your `bash_completion.d/` directory. For example, if you
|
||||
installed bash via [Homebrew](http://brew.sh/):
|
||||
|
||||
```bash
|
||||
etc=/Applications/Docker.app/Contents/Resources/etc
|
||||
|
|
@ -457,10 +505,11 @@ ln -s $etc/docker-compose.bash-completion $(brew --prefix)/etc/bash_completion.d
|
|||
|
||||
### Zsh
|
||||
|
||||
In Zsh, the [completion system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html){:target="_blank" class="_"}
|
||||
takes care of things. To activate completion for Docker commands, these files
|
||||
need to be copied or symlinked to your Zsh `site-functions/` directory. For
|
||||
example, if you installed Zsh via [Homebrew](http://brew.sh/):
|
||||
In Zsh, the [completion
|
||||
system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html){:target="_blank"
|
||||
class="_"} takes care of things. To activate completion for Docker commands,
|
||||
these files need to be copied or symlinked to your Zsh `site-functions/`
|
||||
directory. For example, if you installed Zsh via [Homebrew](http://brew.sh/):
|
||||
|
||||
```bash
|
||||
etc=/Applications/Docker.app/Contents/Resources/etc
|
||||
|
|
@ -486,39 +535,51 @@ options at the bottom of each docs page.
|
|||
## Docker Store
|
||||
|
||||
Choose **Docker Store** from the Docker for Mac menu to get to the Docker app
|
||||
downloads site. [Docker store](https://store.docker.com/){:target="_blank" class="_"} is a component of the
|
||||
next-generation Docker Hub, and the best place to find compliant, trusted
|
||||
commercial and free software distributed as Docker Images.
|
||||
downloads site. [Docker store](https://store.docker.com/){:target="_blank"
|
||||
class="_"} is a component of the next-generation Docker Hub, and the best place
|
||||
to find compliant, trusted commercial and free software distributed as Docker
|
||||
Images.
|
||||
|
||||
{:width="550px"}
|
||||
|
||||
## Docker Cloud
|
||||
|
||||
You can access your [Docker Cloud](/docker-cloud/index.md){:target="_blank" class="_"} account from within Docker for Mac.
|
||||
You can access your [Docker Cloud](/docker-cloud/index.md){:target="_blank"
|
||||
class="_"} account from within Docker for Mac.
|
||||
|
||||
{:width="550px"}
|
||||
|
||||
From the Docker for Mac menu, sign in to Docker Cloud with your Docker ID, or create one.
|
||||
From the Docker for Mac menu, sign in to Docker Cloud with your Docker ID, or
|
||||
create one.
|
||||
|
||||
{: .with-border width="250px"}
|
||||
|
||||
Then use the Docker for Mac menu to create, view, or navigate directly to your
|
||||
Cloud resources, including **organizations**, **repositories**, and **swarms**.
|
||||
|
||||
Check out these [Docker Cloud topics](/docker-cloud/index.md){:target="_blank" class="_"} to learn more:
|
||||
Check out these [Docker Cloud topics](/docker-cloud/index.md){:target="_blank"
|
||||
class="_"} to learn more:
|
||||
|
||||
* [Organizations and Teams in Docker Cloud](/docker-cloud/orgs/index.md){:target="_blank" class="_"}
|
||||
* [Organizations and Teams in Docker
|
||||
Cloud](/docker-cloud/orgs/index.md){:target="_blank" class="_"}
|
||||
* [Builds and Images](/docker-cloud/builds/index.md){:target="_blank" class="_"}
|
||||
* [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md){:target="_blank" class="_"}
|
||||
* [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md){:target="_blank"
|
||||
class="_"}
|
||||
|
||||
Need a direct link to Cloud? [Take me to Docker Cloud](https://cloud.docker.com/){: target="_blank" class="_" }.
|
||||
Need a direct link to Cloud? [Take me to Docker
|
||||
Cloud](https://cloud.docker.com/){: target="_blank" class="_" }.
|
||||
|
||||
## Where to go next
|
||||
|
||||
* Try out the walkthrough at [Get Started](/get-started/){: target="_blank" class="_"}.
|
||||
* Try out the walkthrough at [Get Started](/get-started/){: target="_blank"
|
||||
class="_"}.
|
||||
|
||||
* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
|
||||
* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example
|
||||
walkthroughs and source code.
|
||||
|
||||
* For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/api.md){: target="_blank" class="_"}.
|
||||
* For a summary of Docker command line interface (CLI) commands, see [Docker CLI
|
||||
Reference Guide](/engine/api.md){: target="_blank" class="_"}.
|
||||
|
||||
* Check out the blog post, [What’s New in Docker 17.06 Community Edition (CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" class="_"}.
|
||||
* Check out the blog post, [What’s New in Docker 17.06 Community Edition
|
||||
(CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){:
|
||||
target="_blank" class="_"}.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ notoc: true
|
|||
|
||||
Docker Desktop Editions are built using open source software.
|
||||
For details on the licensing, choose
|
||||
{: .inline} -->
|
||||
{: .inline} →
|
||||
**About Docker** from within the application, then click **Acknowledgements**.
|
||||
|
||||
Docker Desktop Editions distribute some components that are licensed under the
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ for Mac](install.md#download-docker-for-mac).
|
|||
* New
|
||||
- Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See https://docs.docker.com/docker-for-mac/kubernetes/
|
||||
- Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721)
|
||||
- Re-enable raw as the the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
- Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes)
|
||||
|
|
|
|||
|
|
@ -25,21 +25,24 @@ GitHub](https://github.com/docker/for-mac/issues), or the [Docker for Mac
|
|||
forum](https://forums.docker.com/c/docker-for-mac), we can help you troubleshoot
|
||||
the log data.
|
||||
|
||||
Choose {: .inline} -->
|
||||
**Diagnose & Feedback** from the menu bar.
|
||||
Choose {: .inline} → **Diagnose & Feedback**
|
||||
from the menu bar.
|
||||
|
||||
{:width="600px"}
|
||||
|
||||
Select **Diagnose**. It runs diagnostics, shows results, and uploads the
|
||||
results to Docker. A diagnostic ID is generated, which must be provided when
|
||||
communicating with the Docker Team. Optionally, you can open an issue on GitHub
|
||||
using the uploaded results and ID as a basis.
|
||||
Once the diagnostics are available, you can upload them and obtain a
|
||||
**Diagnostic ID**, which must be provided when communicating with the Docker
|
||||
team. For more information on our policy regarding personal data you can read
|
||||
[how is personal data handled in Docker
|
||||
Desktop](https://docs.docker.com/docker-for-mac/faqs/#how-is-personal-data-handled-in-docker-desktop).
|
||||
|
||||
{:width="600px"}
|
||||
{:width="600px"}
|
||||
|
||||
If you click **Report an issue**, this opens [Docker for Mac issues on
|
||||
GitHub](https://github.com/docker/for-mac/issues/) in your web browser in a
|
||||
“create new issue” template, to be completed before submission.
|
||||
"create new issue" template, to be completed before submission. Do not forget to
|
||||
copy/paste your diagnostic ID.
|
||||
|
||||
{:width="600px"}
|
||||
|
||||
|
|
@ -48,57 +51,34 @@ GitHub](https://github.com/docker/for-mac/issues/) in your web browser in a
|
|||
On occasions it is useful to run the diagnostics yourself, for instance if
|
||||
Docker for Mac cannot start.
|
||||
|
||||
First locate the `docker-diagnose` tool. If you installed Docker for Mac in the
|
||||
Applications directory, then it is
|
||||
`/Applications/Docker.app/Contents/Resources/bin/docker-diagnose`. Pass
|
||||
`--help` to see the supported options:
|
||||
|
||||
```sh
|
||||
$ /Applications/Docker.app/Contents/Resources/bin/docker-diagnose --help
|
||||
```
|
||||
First locate the `com.docker.diagnose` tool. If you installed Docker for Mac in
|
||||
the Applications directory, then it is
|
||||
`/Applications/Docker.app/Contents/MacOS/com.docker.diagnose`.
|
||||
|
||||
Then to create *and upload* diagnostics, run:
|
||||
|
||||
```sh
|
||||
$ /Applications/Docker.app/Contents/Resources/bin/docker-diagnose \
|
||||
--upload --last 1d
|
||||
macOS: version 10.13.4 (build: 17E202)
|
||||
Docker.app: version: 18.06.0-ce-rc1-mac67 (1fa4e2acfc1a52f79623add2390604515d32297e)
|
||||
Local time: Fri May 25 14:50:51 CEST 2018
|
||||
UTC: Fri May 25 12:50:51 UTC 2018
|
||||
Timestamp: 20180525-145051
|
||||
Running diagnostic tests:
|
||||
[OK] Files
|
||||
[OK] console-ring does not exist
|
||||
[OK] Kubernetes (disabled)
|
||||
[OK] Docker CLI
|
||||
[OK] environment
|
||||
[OK] vmnetd
|
||||
[OK] osxfs
|
||||
[OK] VPNKit
|
||||
[OK] driver.amd64-linux
|
||||
[OK] Docker
|
||||
[OK] VT-x
|
||||
[OK] kern.hv_support
|
||||
[OK] Hypervisor
|
||||
[OK] Disk
|
||||
Docker logs are being collected into /tmp/D1F48686-F045-4708-85E3-0635B729A596/20180525-145051.tar.gz
|
||||
Your unique id is: D1F48686-F045-4708-85E3-0635B729A596
|
||||
Please quote this in all correspondence.
|
||||
$ /Applications/Docker.app/Contents/MacOS/com.docker.diagnose gather -upload
|
||||
```
|
||||
After the diagnostics have finished, you should have the following output,
|
||||
containing your diagnostics ID:
|
||||
|
||||
```sh
|
||||
Diagnostics Bundle: /tmp/B8CF8400-47B3-4068-ADA4-3BBDCE3985D9/20180726143610.zip
|
||||
Diagnostics ID: B8CF8400-47B3-4068-ADA4-3BBDCE3985D9/20180726143610 (uploaded)
|
||||
```
|
||||
|
||||
The diagnostics ID (here D1F48686-F045-4708-85E3-0635B729A596/20180525-145051)
|
||||
is composed of your user ID (D1F48686-F045-4708-85E3-0635B729A596) and a
|
||||
timestamp (20180525-145051). Be sure to provide us with the full diagnostics
|
||||
ID, not just the user ID.
|
||||
The diagnostics ID (here B8CF8400-47B3-4068-ADA4-3BBDCE3985D9/20180726143610) is
|
||||
composed of your user ID (D1F48686-F045-4708-85E3-0635B729A596) and a timestamp
|
||||
(20180525-145051). Be sure to provide us with the full diagnostics ID, not just
|
||||
the user ID.
|
||||
|
||||
Don't hesitate browsing the content of these diagnostics:
|
||||
|
||||
```sh
|
||||
$ open /tmp/D1F48686-F045-4708-85E3-0635B729A596/20180525-145051.tar.gz
|
||||
$ open /tmp/D1F48686-F045-4708-85E3-0635B729A596/20180525-145051.zip
|
||||
```
|
||||
|
||||
|
||||
<a name="logs"></a>
|
||||
## Check the logs
|
||||
|
||||
|
|
@ -147,10 +127,9 @@ ways, and create reports.
|
|||
|
||||
### Make sure certificates are set up correctly
|
||||
|
||||
Docker for Mac ignores certificates listed under insecure registries, and
|
||||
does not send client certificates to them. Commands like `docker run` that
|
||||
attempt to pull from the registry produces error messages on the command
|
||||
line, like this:
|
||||
Docker for Mac ignores certificates listed under insecure registries, and does
|
||||
not send client certificates to them. Commands like `docker run` that attempt to
|
||||
pull from the registry produces error messages on the command line, like this:
|
||||
|
||||
```
|
||||
Error response from daemon: Get http://192.168.203.139:5858/v2/: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
|
||||
|
|
@ -163,9 +142,8 @@ As well as on the registry. For example:
|
|||
2017/06/20 18:15:30 http: TLS handshake error from 192.168.203.139:52883: tls: first record does not look like a TLS handshake
|
||||
```
|
||||
|
||||
For more about using client and server side certificates, see [Adding
|
||||
TLS certificates](index.md#adding-tls-certificates) in
|
||||
the Getting Started topic.
|
||||
For more about using client and server side certificates, see [Adding TLS
|
||||
certificates](index.md#adding-tls-certificates) in the Getting Started topic.
|
||||
|
||||
### Docker for Mac does not start if Mac user account and home folder are renamed after installing the app
|
||||
|
||||
|
|
@ -181,8 +159,8 @@ cannot start, such as when using [Docker Compose](/compose/gettingstarted.md),
|
|||
you might need to enable [file sharing](index.md#file-sharing).
|
||||
|
||||
Volume mounting requires shared drives for projects that live outside of the
|
||||
`/Users` directory. Go to {: .inline} -->
|
||||
**Preferences** --> **File sharing** and share the drive that contains the
|
||||
`/Users` directory. Go to {: .inline} →
|
||||
**Preferences** → **File sharing** and share the drive that contains the
|
||||
Dockerfile and volume.
|
||||
|
||||
### Incompatible CPU detected
|
||||
|
|
@ -204,8 +182,8 @@ terminal window.
|
|||
sysctl kern.hv_support
|
||||
```
|
||||
|
||||
If your Mac supports the Hypervisor Framework,
|
||||
the command prints `kern.hv_support: 1`.
|
||||
If your Mac supports the Hypervisor Framework, the command prints
|
||||
`kern.hv_support: 1`.
|
||||
|
||||
If not, the command prints `kern.hv_support: 0`.
|
||||
|
||||
|
|
@ -220,9 +198,9 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
* If Docker for Mac fails to install or start properly:
|
||||
|
||||
* Make sure you quit Docker for Mac before installing a new version of the
|
||||
application ({: .inline} --> **Quit
|
||||
Docker**). Otherwise, you get an "application in use" error when you try to
|
||||
copy the new app from the `.dmg` to `/Applications`.
|
||||
application ({: .inline} → **Quit
|
||||
Docker**). Otherwise, you get an "application in use" error when you try to
|
||||
copy the new app from the `.dmg` to `/Applications`.
|
||||
|
||||
* Restart your Mac to stop / discard any vestige of the daemon running from
|
||||
the previously installed version.
|
||||
|
|
@ -251,10 +229,10 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
* For the `hello-world-nginx` example, Docker for Mac must be running to get to
|
||||
the webserver on `http://localhost/`. Make sure that the Docker whale is
|
||||
showing in the menu bar, and that you run the Docker commands in a shell that
|
||||
is connected to the Docker for Mac Engine (not Engine from
|
||||
Toolbox). Otherwise, you might start the webserver container but get a "web
|
||||
page not available" error when you go to `localhost`. For more on
|
||||
distinguishing between the two environments, see [Docker for Mac vs. Docker
|
||||
is connected to the Docker for Mac Engine (not Engine from Toolbox).
|
||||
Otherwise, you might start the webserver container but get a "web page not
|
||||
available" error when you go to `localhost`. For more on distinguishing
|
||||
between the two environments, see [Docker for Mac vs. Docker
|
||||
Toolbox](docker-toolbox.md).
|
||||
|
||||
<p></p>
|
||||
|
|
@ -274,7 +252,7 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
* IPv6 is not (yet) supported on Docker for Mac.
|
||||
|
||||
A workaround is provided that auto-filters out the IPv6 addresses in DNS
|
||||
server lists and enables successful network accesss. For example,
|
||||
server lists and enables successful network access. For example,
|
||||
`2001:4860:4860::8888` would become `8.8.8.8`. To learn more, see these
|
||||
issues on GitHub and Docker for Mac forums:
|
||||
|
||||
|
|
@ -297,9 +275,8 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
resources. Reboot and restart Docker to resolve these issues.
|
||||
|
||||
* Docker does not auto-start on login even when it is enabled in {: .inline} --> **Preferences**. This
|
||||
is related to a set of issues with Docker helper, registration, and
|
||||
versioning.
|
||||
menu](images/whale-x.png){: .inline} → **Preferences**. This is related to a
|
||||
set of issues with Docker helper, registration, and versioning.
|
||||
|
||||
<p></p>
|
||||
|
||||
|
|
@ -309,9 +286,9 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
[Intel Hardware Accelerated Execution Manager
|
||||
(HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/),
|
||||
the current workaround is not to run them at the same time. You can pause
|
||||
`HyperKit` by quitting Docker for Mac temporarily while you work with
|
||||
HAXM. This allows you to continue work with the other tools and prevent
|
||||
`HyperKit` from interfering.
|
||||
`HyperKit` by quitting Docker for Mac temporarily while you work with HAXM.
|
||||
This allows you to continue work with the other tools and prevent `HyperKit`
|
||||
from interfering.
|
||||
|
||||
|
||||
* If you are working with applications like [Apache
|
||||
|
|
@ -351,7 +328,8 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
- Symfony
|
||||
- Magento
|
||||
- Zend Framework
|
||||
- PHP applications that use [Composer](https://getcomposer.org) to install dependencies in a ```vendor``` folder<br><br>
|
||||
- PHP applications that use [Composer](https://getcomposer.org) to install
|
||||
dependencies in a ```vendor``` folder<br><br>
|
||||
|
||||
As a work-around for this behavior, you can put vendor or third-party library
|
||||
directories in Docker volumes, perform temporary file system operations
|
||||
|
|
@ -362,15 +340,17 @@ know before you install](install.md#what-to-know-before-you-install).
|
|||
and roadmap](osxfs.md#performance-issues-solutions-and-roadmap).
|
||||
|
||||
* If your system does not have access to an NTP server, then after a hibernate
|
||||
the time seen by Docker for Mac may be considerably out of sync with the
|
||||
host. Furthermore, the time may slowly drift out of sync during use. To
|
||||
manually reset the time after hibernation, run:
|
||||
the time seen by Docker for Mac may be considerably out of sync with the host.
|
||||
Furthermore, the time may slowly drift out of sync during use. To manually
|
||||
reset the time after hibernation, run:
|
||||
|
||||
```bash
|
||||
docker run --rm --privileged alpine hwclock -s
|
||||
```
|
||||
|
||||
Or, to resolve both issues, you can add the local clock as a low-priority (high stratum) fallback NTP time source for the host. To do this, edit the host's `/etc/ntp-restrict.conf` to add:
|
||||
Or, to resolve both issues, you can add the local clock as a low-priority
|
||||
(high stratum) fallback NTP time source for the host. To do this, edit the
|
||||
host's `/etc/ntp-restrict.conf` to add:
|
||||
|
||||
```
|
||||
server 127.127.1.1 # LCL, local clock
|
||||
|
|
|
|||
|
|
@ -18,6 +18,27 @@ for Windows](install.md#download-docker-for-windows).
|
|||
|
||||
## Edge Releases of 2018
|
||||
|
||||
### Docker Community Edition 2.0.0.0-beta1-win75 2018-09-14
|
||||
|
||||
[Download](https://download.docker.com/win/edge/19925/Docker%20for%20Windows%20Installer.exe)
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.0-ce-beta1](https://github.com/docker/docker-ce/releases/tag/v18.09.0-ce-beta1)
|
||||
- Linux Kernel 4.9.125
|
||||
|
||||
* New
|
||||
- New version scheme
|
||||
|
||||
* Deprecation
|
||||
- Removed support of AUFS
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- LCOW does not anymore need --platform flag on multi-arch images
|
||||
- Better WCOW host.docker.internal resolution on host, don't rewrite it if not modified. From [docker/for-win#1976](https://github.com/docker/for-win/issues/1976)
|
||||
- Disk size can now be ajusted from 32GiB to drive space.
|
||||
- Fix dns update too verbose in logs
|
||||
- Fix panic in diagnose
|
||||
|
||||
### Docker Community Edition 18.06.1-ce-win74 2018-08-29
|
||||
|
||||
[Download](https://download.docker.com/win/edge/19508/Docker%20for%20Windows%20Installer.exe)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Two different download channels are available for Docker for Windows:
|
|||
* The **Stable channel** provides a general availability release-ready installer
|
||||
for a fully baked and tested, more reliable app. The Stable version of Docker
|
||||
for Windows comes with the latest released version of Docker Engine. The
|
||||
release schedule is synched with Docker Engine releases and hotfixes. On the
|
||||
release schedule is synced with Docker Engine releases and hotfixes. On the
|
||||
Stable channel, you can select whether to send usage statistics and other data.
|
||||
|
||||
* The **Edge channel** provides an installer with new features we are working on,
|
||||
|
|
@ -69,7 +69,8 @@ Do the following each time:
|
|||
4. Install a different version of the app (Stable or Edge).
|
||||
|
||||
|
||||
### Feeback
|
||||
### Feedback
|
||||
|
||||
#### What kind of feedback are we looking for?
|
||||
|
||||
Everything is fair game. We'd like your impressions on the download-install
|
||||
|
|
@ -150,8 +151,8 @@ topic
|
|||
No, at this point, Docker for Windows does not enable you to control (`chmod`)
|
||||
the Unix-style permissions on [shared volumes](/docker-for-windows#shared-drives) for
|
||||
deployed containers, but rather sets permissions to a default value of
|
||||
[0755](http://permissions-calculator.org/decode/0755/){: target="_blank" class="_"}
|
||||
(`read`, `write`, `execute` permissions for `user`, `read` and `execute` for
|
||||
[0777](http://permissions-calculator.org/decode/0777/){: target="_blank" class="_"}
|
||||
(`read`, `write`, `execute` permissions for `user` and for
|
||||
`group`) which is not configurable.
|
||||
|
||||
For workarounds and to learn more, see
|
||||
|
|
@ -281,5 +282,4 @@ in [Troubleshooting](troubleshoot).
|
|||
You might decide that you do not need Toolbox now that you have Docker for
|
||||
Windows, and want to uninstall it. For details on how to perform a clean
|
||||
uninstall of Toolbox on Windows, see
|
||||
[How to uninstall Toolbox](/toolbox/toolbox_install_windows#how-to-uninstall-toolbox) in the
|
||||
Toolbox Windows topics.
|
||||
[How to uninstall Toolbox](/toolbox/toolbox_install_windows#how-to-uninstall-toolbox) in the Toolbox Windows topics.
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 110 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 213 KiB After Width: | Height: | Size: 123 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 212 KiB After Width: | Height: | Size: 95 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 82 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 90 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 90 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 176 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue