diff --git a/compose/django.md b/compose/django.md index 584f7164137..516c9a51549 100644 --- a/compose/django.md +++ b/compose/django.md @@ -177,15 +177,25 @@ In this section, you set up the database connection for Django. > **Note:** > On certain platforms (Windows 10), you may additionally need to edit `ALLOWED_HOSTS` -> inside settings.py and add your Docker hostname or IP to the list. For demo +> inside settings.py and add your Docker hostname or IP to the list. For demo > purposes, you may set the value to: > > ALLOWED_HOSTS = ['*'] > -> Please note this value is **not** safe for production usage. Refer to the -> [Django documentation](https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts) +> Please note this value is **not** safe for production usage. Refer to the +> [Django documentation](https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts) > for more information. +5. Clean up: Shut down containers with CONTROL-C. + + ``` + Gracefully stopping... (press Ctrl+C again to force) + Killing test_web_1 ... done + Killing test_db_1 ... done + ``` + + It's safe to `rm -rf` your project directory. + ## More Compose documentation - [User guide](index.md) diff --git a/docker-cloud/apps/stack-yaml-reference.md b/docker-cloud/apps/stack-yaml-reference.md index 903feaec2c9..1ffbf997110 100644 --- a/docker-cloud/apps/stack-yaml-reference.md +++ b/docker-cloud/apps/stack-yaml-reference.md @@ -1,12 +1,14 @@ --- -description: Stack YAML reference -keywords: YAML, stack, reference +description: Stack YAML reference for Docker Cloud +keywords: YAML, stack, reference, docker cloud redirect_from: - /docker-cloud/feature-reference/stack-yaml-reference/ -title: Cloud stack file YAML reference +title: Docker Cloud stack file YAML reference --- -A stack is a collection of services that make up an application in a specific environment. Learn more about stacks [here](stacks.md). A **stack file** is a file in YAML format that defines one or more services, similar to a `docker-compose.yml` file but with a few extensions. The default name for this file is `docker-cloud.yml`. +A stack is a collection of services that make up an application in a specific environment. Learn more about stacks for Docker Cloud [here](stacks.md). A **stack file** is a file in YAML format that defines one or more services, similar to a `docker-compose.yml` file for Docker Compose but with a few extensions. The default name for this file is `docker-cloud.yml`. + +[Looking for information on stack files for Swarm?](/compose/compose-files/index.md). ## Stack file example diff --git a/docker-for-mac/osxfs.md b/docker-for-mac/osxfs.md index c1c35636a38..0dac0a5f04c 100644 --- a/docker-for-mac/osxfs.md +++ b/docker-for-mac/osxfs.md @@ -55,10 +55,10 @@ Desktop boot etc lib lib64 media opt root sbin sys usr bin dev home lib32 libx32 mnt proc run srv tmp var ``` -By default, you can share files in `/Users/`, `/Volumes/`, `/private/`, and `/tmp` +By default, you can share files in `/Users/`, `/Volumes/`, `/private/`, and `/tmp` directly. -To add or remove directory trees that are exported to Docker, use the -**File sharing** tab in Docker preferences ![Docker Preferences]("docker-for-mac/images/whale-x.png) -> **Preferences** -> +To add or remove directory trees that are exported to Docker, use the +**File sharing** tab in Docker preferences ![Docker Preferences](images/whale-x.png) -> **Preferences** -> **File sharing**. (See [Preferences](index.md#preferences).) All other paths @@ -171,7 +171,7 @@ you may experience exceptional, adequate, or poor performance with `osxfs`, the file system server in Docker for Mac. File system APIs are very wide (20-40 message types) with many intricate semantics involving on-disk state, in-memory cache state, and concurrent access by multiple processes. Additionally, `osxfs` -integrates a mapping between macOS's FSEvents API and Linux's inotify API +integrates a mapping between macOS's FSEvents API and Linux's `inotify` API which is implemented inside of the file system itself complicating matters further (cache behavior in particular). @@ -317,7 +317,7 @@ the Beta channel in the coming release cycles. In due course, we will open source all of our shared file system components. At that time, we would be very happy to collaborate with you on improving the -implementation of osxfs and related software. +implementation of `osxfs` and related software. We still have on the slate to write up and publish details of shared file system performance analysis and improvement on the Docker blog. Look for or nudge diff --git a/engine/getstarted-voting-app/images/vote-results.png b/engine/getstarted-voting-app/images/vote-results.png new file mode 100644 index 00000000000..f6cd39d151d Binary files /dev/null and b/engine/getstarted-voting-app/images/vote-results.png differ diff --git a/engine/getstarted-voting-app/images/vote-results.png.orig b/engine/getstarted-voting-app/images/vote-results.png.orig new file mode 100644 index 00000000000..f6cd39d151d Binary files /dev/null and b/engine/getstarted-voting-app/images/vote-results.png.orig differ diff --git a/engine/getstarted-voting-app/images/vote.png b/engine/getstarted-voting-app/images/vote.png new file mode 100644 index 00000000000..bdf9c99620c Binary files /dev/null and b/engine/getstarted-voting-app/images/vote.png differ diff --git a/engine/getstarted-voting-app/images/vote.png.orig b/engine/getstarted-voting-app/images/vote.png.orig new file mode 100644 index 00000000000..bdf9c99620c Binary files /dev/null and b/engine/getstarted-voting-app/images/vote.png.orig differ diff --git a/engine/swarm/swarm-mode.md b/engine/swarm/swarm-mode.md index 32d0e8c6aad..92e5744436a 100644 --- a/engine/swarm/swarm-mode.md +++ b/engine/swarm/swarm-mode.md @@ -121,7 +121,7 @@ $ docker swarm join-token manager To add a worker to this swarm, run the following command: docker swarm join \ - --token SWMTKN-1-49nj1cmql0jkz5s954yi3oex3nedyz0fb0xx14ie39trti4wxv-8vxv8rssmk743ojnwacrr2e7c \ + --token SWMTKN-1-59egwe8qangbzbqb3ryawxzk3jn97ifahlsrw01yar60pmkr90-bdjfnkcflhooyafetgjod97sz \ 192.168.99.100:2377 ``` @@ -156,13 +156,13 @@ token. Specify whether you want to rotate the token for `worker` or `manager` nodes: ```bash -$docker swarm join-token --rotate worker +$ docker swarm join-token --rotate worker To add a worker to this swarm, run the following command: docker swarm join \ --token SWMTKN-1-2kscvs0zuymrsc9t0ocyy1rdns9dhaodvpl639j2bqx55uptag-ebmn5u927reawo27s3azntd44 \ - 172.17.0.2:2377 + 192.168.99.100:2377 ``` ## Learn More