docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1203 from docker/master 

Merge master into amberjack
This commit is contained in:
paigehargrave 2019-06-13 14:18:39 -04:00 committed by GitHub
parent 280fe33a45 4c40161382
commit f19a09a571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 153 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
Jenkinsfile vendored
View File

@ -5,7 +5,6 @@ pipeline {
label 'ubuntu-1604-aufs-stable'
}
environment {
DTR_VPN_ADDRESS = credentials('dtr-vpn-address')
DTR_URL = credentials('dtr-url')
DOCKER_HOST_STRING = credentials('docker-host')
UCP_BUNDLE = credentials('ucp-bundle')
@ -26,19 +25,17 @@ pipeline {
branch 'master'
}
steps {
withVpn("$DTR_VPN_ADDRESS") {
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} docs-stage-docker-com_docs --with-registry-auth
"""
}
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} docs-stage-docker-com_docs --with-registry-auth
"""
}
}
stage( 'build + push prod image, update prod swarm' ) {
@ -46,21 +43,19 @@ pipeline {
branch 'published'
}
steps {
withVpn("$DTR_VPN_ADDRESS") {
withDockerRegistry(reg) {
sh """
docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} .
docker push docs/docker.github.io:prod-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
cd ucp-bundle-success_bot
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image docs/docker.github.io:prod-${env.BUILD_NUMBER} docs-docker-com_docs --with-registry-auth
curl -X POST -H 'Content-type: application/json' --data '{"text":"Successfully published docs. https://docs.docker.com/"}' $SLACK
"""
}
withDockerRegistry(reg) {
sh """
docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} .
docker push docs/docker.github.io:prod-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
cd ucp-bundle-success_bot
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image docs/docker.github.io:prod-${env.BUILD_NUMBER} docs-docker-com_docs --with-registry-auth
curl -X POST -H 'Content-type: application/json' --data '{"text":"Successfully published docs. https://docs.docker.com/"}' $SLACK
"""
}
}
}
@ -76,19 +71,17 @@ pipeline {
branch 'amberjack'
}
steps {
withVpn("$DTR_VPN_ADDRESS") {
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} docs-beta-stage-docker-com_docs --with-registry-auth
"""
}
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} docs-beta-stage-docker-com_docs --with-registry-auth
"""
}
}
stage( 'build + push beta image, update beta swarm' ) {
@ -96,19 +89,17 @@ pipeline {
branch 'published'
}
steps {
withVpn("$DTR_VPN_ADDRESS") {
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
"""
}
sh """
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
docker build -t $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} .
docker push $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER}
unzip -o $UCP_BUNDLE
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=$DOCKER_HOST_STRING
docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
"""
}
}
}

53
_config.yml
View File

@ -13,7 +13,7 @@ safe: false
lsi: false
url: https://docs.docker.com
# This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile)
keep_files: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03"]
keep_files: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03", "v18.09"]
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"]
# Component versions -- address like site.docker_ce_version
@ -22,18 +22,20 @@ exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.
latest_engine_api_version: "1.40"
docker_ce_version: "19.03"
docker_ee_version: "19.03"
compose_version: "1.24.0"
compose_version: "1.25.0"
compose_file_v3: "3.7"
compose_file_v2: "2.4"
machine_version: "0.16.0"
distribution_version: "2.6"
dtr_version: "2.6"
ucp_version: "3.1"
machine_version: "0.16.1"
distribution_version: "2.7"
dtr_version: "2.7"
ucp_version: "3.2"
ucp_versions:
- version: "3.1"
- version: "3.2"
path: /ee/ucp/
latest: true
- version: "3.1"
path: /datacenter/ucp/3.1/guides/
- version: "3.0"
path: /datacenter/ucp/3.0/guides/
- version: "2.2"
@ -46,9 +48,11 @@ ucp_versions:
path: /datacenter/ucp/1.1/overview/
dtr_versions:
- version: "2.6"
- version: "2.7"
path: /ee/dtr/
latest: true
- version: "2.6"
path: /datacenter/dtr/2.6/guides/
- version: "2.5"
path: /datacenter/dtr/2.5/guides/
- version: "2.4"
@ -63,11 +67,22 @@ dtr_versions:
path: /datacenter/dtr/2.0/
tablabels:
dee-3.0: Docker Enterprise Edition 3.0
dee-2.1: Docker Enterprise Edition 2.1
dee-2.0: Docker Enterprise Edition 2.0
ucp-3.2: Universal Control Plane 3.2
ucp-3.1: Universal Control Plane 3.1
ucp-3.0: Universal Control Plane 3.0
ucp-2.2: Universal Control Plane 2.2
dtr-2.7: Docker Trusted Registry 2.7
dtr-2.6: Docker Trusted Registry 2.6
dtr-2.5: Docker Trusted Registry 2.5
dtr-2.4: Docker Trusted Registry 2.4
engine-19.03: Docker EE Engine 19.03
engine-18.09: Docker EE Engine 18.09
engine-18.03: Docker EE Engine 18.03
engine-17.12: Docker EE Engine 17.12
engine-17.09: Docker EE Engine 17.09
engine-17.06: Docker EE Engine 17.06
engine-17.03: Docker EE Engine 17.03
docker-cli-linux: Docker CLI on Mac/Linux
@ -106,7 +121,14 @@ defaults:
values:
dtr_org: "docker"
dtr_repo: "dtr"
dtr_version: "2.7.0-beta4"
dtr_version: "2.7.0"
- scope:
path: "datacenter/dtr/2.6"
values:
hide_from_sitemap: true
dtr_org: "docker"
dtr_repo: "dtr"
dtr_version: "2.6.6"
- scope:
path: "datacenter/dtr/2.5"
values:
@ -149,15 +171,22 @@ defaults:
values:
ucp_org: "docker"
ucp_repo: "ucp"
ucp_version: "3.2.0-beta4"
ucp_version: "3.2.0"
- scope: # This is a bit of a hack for the get-support.md topic.
path: "ee"
values:
ucp_org: "docker"
ucp_repo: "ucp"
dtr_repo: "dtr"
ucp_version: "3.2.0-beta4"
dtr_version: "2.7.0-beta4"
ucp_version: "3.2.0"
dtr_version: "2.7.0"
- scope:
path: "datacenter/ucp/3.1"
values:
hide_from_sitemap: true
ucp_org: "docker"
ucp_repo: "ucp"
ucp_version: "3.1.7"
- scope:
path: "datacenter/ucp/3.0"
values:

5
_data/docsarchive/archives.yaml
View File

@ -1,5 +1,5 @@
- archive:
name: v18.09
name: v19.03
image: docs/docker.github.io:latest
current: true
# When you make a new stable archive version, move the edge one to be second in
@ -7,6 +7,9 @@
- archive:
name: edge
image: docs/docker.github.io:latest
- archive:
name: v18.09
image: docs/docker.github.io:v18.09
- archive:
name: v18.03
image: docs/docker.github.io:v18.03

2
_data/toc.yaml
View File

@ -3559,6 +3559,8 @@ manuals:
section:
- path: /docker-hub/publish/
title: Overview
- path: /docker-hub/publish/publish/
title: Submit a product for Docker Hub
- path: /docker-hub/publish/customer_faq/
title: User FAQs
- path: /docker-hub/publish/publisher_faq/

3
_includes/experimental-feature.md Normal file
View File

@ -0,0 +1,3 @@
<!-- This text will be included in the docs that are marked as experimental -->
Experimental features provide early access to future product functionality. These features are intended for testing and feedback only as they may change between releases without warning or can be removed entirely from a future release. Experimental features must not be used in production environments. Docker does not offer support for experimental features.

15
_includes/kubernetes-mac-win.md
View File

@ -145,28 +145,23 @@ version: '3.3'
services:
web:
build: web
image: dockerdemos/lab-web
volumes:
- "./web/static:/static"
image: dockersamples/k8s-wordsmith-web
ports:
- "80:80"
words:
build: words
image: dockerdemos/lab-words
image: dockersamples/k8s-wordsmith-api
deploy:
replicas: 5
endpoint_mode: dnsrr
resources:
limits:
memory: 16M
memory: 50M
reservations:
memory: 16M
memory: 50M
db:
build: db
image: dockerdemos/lab-db
image: dockersamples/k8s-wordsmith-db
```
If you already have a Kubernetes YAML file, you can deploy it using the

9
config/containers/logging/local.md
View File

@ -11,8 +11,9 @@ The `local` logging driver captures output from container's stdout/stderr and
writes them to an internal storage that is optimized for performance and disk
use.
By default the `local` driver preserves 100MB of log messages per container and
uses automatic compression to reduce the size on disk.
By default, the `local` driver preserves 100MB of log messages per container and
uses automatic compression to reduce the size on disk. The 100MB default value is based on a 20M default size
for each file and a default count of 5 for the number of such files (to account for log rotation).
> *Note*: the `local` logging driver currently uses file-based storage. The
> file-format and storage mechanism are designed to be exclusively accessed by
@ -58,7 +59,7 @@ The `local` logging driver supports the following logging options:
| Option | Description | Example value |
|:------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------------------|
| `max-size` | The maximum size of the log before it is rolled. A positive integer plus a modifier representing the unit of measure (`k`, `m`, or `g`). Defaults to 20m. | `--log-opt max-size=10m` |
| `max-file` | The maximum number of log files that can be present. If rolling the logs creates excess files, the oldest file is removed. **Only effective when `max-size` is also set.** A positive integer. Defaults to 5. | `--log-opt max-file=3` |
| `max-file` | The maximum number of log files that can be present. If rolling the logs creates excess files, the oldest file is removed. A positive integer. Defaults to 5. | `--log-opt max-file=3` |
| `compress` | Toggle compression of rotated log files. Enabled by default. | `--log-opt compress=false` |
### Examples
@ -67,5 +68,5 @@ This example starts an `alpine` container which can have a maximum of 3 log
files no larger than 10 megabytes each.
```bash
$ docker run -it --log-opt max-size=10m --log-opt max-file=3 alpine ash
$ docker run -it --log-driver local --log-opt max-size=10m --log-opt max-file=3 alpine ash
```

7
docker-for-mac/faqs.md
View File

@ -11,6 +11,7 @@ title: Frequently asked questions (FAQ)
for knowledge base articles, FAQs, technical support for subscription levels, and more.
## Questions about Docker.app
### Stable and Edge channels
**Q: How do I get the Stable or Edge version of Docker Desktop for Mac?**
@ -113,7 +114,6 @@ To preserve them, open the `~/Library/Group
Containers/group.com.docker/settings.json` file, and update the `diskPath`
entry.
### Do I need to uninstall Docker Toolbox to use Docker for Mac?
No, you can use these side by side. Docker Toolbox leverages a Docker daemon
@ -135,7 +135,12 @@ and want to uninstall it. For details on how to perform a clean uninstall of
Toolbox on the Mac, see [How to uninstall Toolbox](/toolbox/toolbox_install_mac/#how-to-uninstall-toolbox)
in the Toolbox Mac topics.
## Experimental features
{% include experimental-feature.md %}
## Questions about feedback and help
### What kind of feedback are we looking for?
Everything is fair game. We'd like your impressions on the download-install

50
docker-for-windows/faqs.md
View File

@ -8,16 +8,16 @@ title: Frequently asked questions (FAQ)
[Docker Success Center](http://success.docker.com/){: target="_blank" class="_"}
for knowledge base articles, FAQs, technical support for subscription levels, and more.
### Questions about Stable and Edge channels
## Questions about Stable and Edge channels
#### How do I get the Stable or Edge version of Docker Desktop for Windows?
### How do I get the Stable or Edge version of Docker Desktop for Windows?
Use the download links for the channels given in the topic
[Download Docker Desktop for Windows](install#download-docker-for-windows).
This topic also has more information about the two channels.
#### What is the difference between the Stable and Edge versions of Docker Desktop for Windows?
### What is the difference between the Stable and Edge versions of Docker Desktop for Windows?
Two different download channels are available for Docker Desktop for Windows:
@ -35,7 +35,7 @@ Two different download channels are available for Docker Desktop for Windows:
Stable, often one or more per month. Usage statistics and crash reports are
sent by default. You do not have the option to disable this on the Edge channel.
#### Can I switch back and forth between Stable and Edge versions of Docker Desktop for Windows?
### Can I switch back and forth between Stable and Edge versions of Docker Desktop for Windows?
Yes, you can switch between versions to try out the Edge release to see what's
new, then go back to Stable for other work. However, **you can have only one app
@ -54,7 +54,7 @@ to save images and export the containers you need, then uninstall the current
version before installing another. The workflow is described in more detail
below.</font><br>
#### How to save and restore data
### How to save and restore data
The following procedure can be used to save/restore images and container data,
for example, if you want to switch between Edge and Stable, or reset your VM
@ -82,9 +82,13 @@ disk:
procedure](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes)
explains how to backup and restore data volumes.
### Feedback
## Experimental features
#### What kind of feedback are we looking for?
{% include experimental-feature.md %}
## Feedback
### What kind of feedback are we looking for?
Everything is fair game. We'd like your impressions on the download-install
process, startup, functionality available, the GUI, usefulness of the app,
@ -95,7 +99,7 @@ We are especially interested in getting feedback on the new swarm mode described
in [Docker Swarm](/engine/swarm/). A good place to start is the
[tutorial](/engine/swarm/swarm-tutorial/).
#### What if I have problems or questions?
### What if I have problems or questions?
You can find the list of frequent issues in
[Logs and Troubleshooting](troubleshoot).
@ -111,7 +115,7 @@ provides discussion threads as well, and you can create discussion topics there,
but we recommend using the GitHub issues over the forums for better tracking and
response.
#### How can I opt out of sending my usage data?
### How can I opt out of sending my usage data?
If you do not want auto-send of usage data, use the Stable channel. For more
information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker Desktop for Windows?").
@ -158,8 +162,9 @@ See also [Docker Engine API](/engine/api) and the Docker Desktop for Windows for
topic
[How to find the remote API](https://forums.docker.com/t/how-to-find-the-remote-api/20988){: target="_blank" class="_"}.
### Volumes
#### Can I change permissions on shared volumes for container-specific deployment requirements?
## Volumes
### Can I change permissions on shared volumes for container-specific deployment requirements?
No, at this point, Docker Desktop for Windows does not enable you to control (`chmod`)
the Unix-style permissions on [shared volumes](/docker-for-windows#shared-drives) for
@ -171,14 +176,14 @@ deployed containers, but rather sets permissions to a default value of
For workarounds and to learn more, see
[Permissions errors on data directories for shared volumes](troubleshoot#permissions-errors-on-data-directories-for-shared-volumes).
#### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive?
### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive?
Currently, `inotify` does not work on Docker Desktop for Windows. This is a known issue.
For more information and a temporary workaround, see
[inotify on shared drives does not work](troubleshoot#inotify-on-shared-drives-does-not-work){: target="_blank" class="_"}
in [Troubleshooting](troubleshoot).
#### Are symlinks supported?
### Are symlinks supported?
Docker Desktop for Windows supports symbolic links (symlinks) created within containers.
Symlinks resolve within and across containers.
@ -192,10 +197,9 @@ To learn more about the reasons for this limitation, see the following discussio
* Docker Desktop for Windows forums topic:
[Symlinks on shared volumes not supported](https://forums.docker.com/t/symlinks-on-shared-volumes-not-supported/9288){: target="_blank" class="_"}
## Certificates
### Certificates
#### How do I add custom CA certificates?
### How do I add custom CA certificates?
Starting with Docker Desktop for Windows 1.12.1, 2016-09-16 (Stable) and Beta 26
(2016-09-14 1.12.1-beta26), all trusted Certificate Authorities (CA) (root or
@ -211,7 +215,7 @@ To learn more about how to install a CA root certificate for the registry, see
[Verify repository client with certificates](/engine/security/certificates)
in the Docker Engine topics.
#### How do I add client certificates?
### How do I add client certificates?
Starting with Docker Desktop for Windows 17.06.0-ce, you do not need to push your
certificates with `git` commands anymore. You can put your client certificates
@ -262,27 +266,27 @@ Getting Started topic. For more about Docker Machine itself, see
[What is Docker Machine?](/machine/overview#what-is-docker-machine), and the
[Hyper-V driver](/machine/drivers/hyper-v) for Docker Machine.
### Windows Requirements
## Windows Requirements
#### How do I run Windows containers on Docker Desktop on Windows Server 2016?
### How do I run Windows containers on Docker Desktop on Windows Server 2016?
See [About Windows containers and Windows Server 2016](/install/windows/docker-ee/#about-docker-ee-containers-and-windows-server).
A full tutorial is available in [docker/labs](https://github.com/docker/labs){: target="_blank" class="_"} at
[Getting Started with Windows Containers](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md){: target="_blank" class="_"}.
#### Why is Windows 10 Home not supported?
### Why is Windows 10 Home not supported?
Docker Desktop for Windows requires the Hyper-V Windows feature which is not
available on Home-edition.
#### Why is Windows 10 required?
### Why is Windows 10 required?
Docker Desktop for Windows uses Windows Hyper-V. While older Windows versions have
Hyper-V, their Hyper-V implementations lack features critical for Docker Desktop for
Windows to work.
#### Why does Docker Desktop for Windows fail to start when firewalls or anti-virus software is installed?
### Why does Docker Desktop for Windows fail to start when firewalls or anti-virus software is installed?
Some firewalls and anti-virus software might be incompatible with Hyper-V and
some Windows 10 builds (possibly, the Anniversary Update), which impacts Docker
@ -290,7 +294,7 @@ Desktop for Windows. See details and workarounds in
[Docker fails to start when firewall or anti-virus software is installed](troubleshoot#docker-fails-to-start-when-firewall-or-anti-virus-software-is-installed)
in [Troubleshooting](troubleshoot).
### How do I uninstall Docker Toolbox?
## How do I uninstall Docker Toolbox?
You might decide that you do not need Toolbox now that you have Docker Desktop for
Windows, and want to uninstall it. For details on how to perform a clean

3
ee/ucp/kubernetes/deploy-with-compose.md
View File

@ -29,19 +29,16 @@ version: '3.3'
services:
web:
build: web
image: dockersamples/k8s-wordsmith-web
ports:
- "8080:80"
words:
build: words
image: dockersamples/k8s-wordsmith-api
deploy:
replicas: 5
db:
build: db
image: dockersamples/k8s-wordsmith-db
```

4
engine/examples/dotnetcore.md
View File

@ -41,7 +41,7 @@ Windows](/docker-for-windows/). Read more on [switching containers](/docker-for-
the `Dockerfile` to use the DLL file of your project.
```dockerfile
FROM microsoft/dotnet:sdk AS build-env
FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build-env
WORKDIR /app
# Copy csproj and restore as distinct layers
@ -53,7 +53,7 @@ COPY . ./
RUN dotnet publish -c Release -o out
# Build runtime image
FROM microsoft/dotnet:aspnetcore-runtime
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2
WORKDIR /app
COPY --from=build-env /app/out .
ENTRYPOINT ["dotnet", "aspnetapp.dll"]

16
engine/release-notes.md
View File

@ -312,15 +312,17 @@ Update your configuration if this command prints a non-empty value for `MountFla
This issue is resolved in 18.09.1.
### Deprecation Notice
### Deprecation Notices
As of EE 2.1, Docker has deprecated support for Device Mapper as a storage driver. It will continue to be supported at this
time, but support will be removed in a future release. Docker will continue to support Device Mapper for existing
EE 2.0 and 2.1 customers. Please contact Sales for more information.
- As of EE 2.1, Docker has deprecated support for Device Mapper as a storage driver. It will continue to be
supported at this time, but support will be removed in a future release. Docker will continue to support
Device Mapper for existing EE 2.0 and 2.1 customers. Please contact Sales for more information.
Docker recommends that existing customers [migrate to using Overlay2 for the storage driver](https://success.docker.com/article/how-do-i-migrate-an-existing-ucp-cluster-to-the-overlay2-graph-driver).
The [Overlay2 storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/) is now the
default for Docker engine implementations.
Docker recommends that existing customers
[migrate to using Overlay2 for the storage driver](https://success.docker.com/article/how-do-i-migrate-an-existing-ucp-cluster-to-the-overlay2-graph-driver). The [Overlay2 storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/) is now the default for Docker engine implementations.
- As of EE 2.1, Docker has deprecated support for IBM Z (s390x). Refer to the
[Docker Compatibility Matrix](https://success.docker.com/article/compatibility-matrix) for detailed
compatibility information.
For more information on the list of deprecated flags and APIs, have a look at the [deprecation information](https://docs.docker.com/engine/deprecated/) where you can find the target removal dates.

3
robots.txt
View File

@ -14,6 +14,7 @@ Disallow: /v1.13/
Disallow: /v17.03/
Disallow: /v17.06/
Disallow: /v18.03/
Disallow: /v18.09/
# Docker Datacenter archives
Disallow: /datacenter/dtr/2.0
@ -22,7 +23,9 @@ Disallow: /datacenter/dtr/2.2
Disallow: /datacenter/dtr/2.3
Disallow: /datacenter/dtr/2.4
Disallow: /datacenter/dtr/2.5
Disallow: /datacenter/dtr/2.6
Disallow: /datacenter/ucp/3.1
Disallow: /datacenter/ucp/3.0
Disallow: /datacenter/ucp/2.1
Disallow: /datacenter/ucp/2.0