Skip to content

Commit 2ce808e

Browse files
committed
Remove references to obsolete engine versions
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 43ce72c commit 2ce808e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+253
-334
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
### Project version(s) affected
1818

1919
<!-- If this problem only affects specific versions of a project (like Docker
20-
Engine 1.13), tell us here. The fix may need to take that into account. -->
20+
Engine 19.03), tell us here. The fix may need to take that into account. -->
2121

2222
### Suggestions for a fix
2323

_includes/content/compose-extfields-sub.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ your Compose file and their name start with the `x-` character sequence.
99
> of service, volume, network, config and secret definitions.
1010
1111
```yaml
12-
version: '3.4'
12+
version: "{{ site.compose_file_v3 }}"
1313
x-custom:
1414
items:
1515
- a
@@ -35,7 +35,7 @@ logging:
3535
You may write your Compose file as follows:
3636
3737
```yaml
38-
version: '3.4'
38+
version: "{{ site.compose_file_v3 }}"
3939
x-logging:
4040
&default-logging
4141
options:
@@ -56,7 +56,7 @@ It is also possible to partially override values in extension fields using
5656
the [YAML merge type](https://yaml.org/type/merge.html). For example:
5757
5858
```yaml
59-
version: '3.4'
59+
version: "{{ site.compose_file_v3 }}"
6060
x-volumes:
6161
&default-volume
6262
driver: foobar-storage

_includes/kubernetes-mac-win.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Docker has created the following demo app that you can deploy to swarm mode or
141141
to Kubernetes using the `docker stack deploy` command.
142142

143143
```yaml
144-
version: '3.3'
144+
version: "{{ site.compose_file_v3 }}"
145145

146146
services:
147147
web:

compose/aspnet-mssql-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ configure this app to use our SQL Server database, and then create a
9595
> base 10 digits and/or non-alphanumeric symbols.
9696
9797
```yaml
98-
version: "3"
98+
version: "{{ site.compose_file_v3 }}"
9999
services:
100100
web:
101101
build: .

compose/networking.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,27 @@ container for a service joins the default network and is both *reachable* by
1212
other containers on that network, and *discoverable* by them at a hostname
1313
identical to the container name.
1414

15-
> **Note**: Your app's network is given a name based on the "project name",
15+
> **Note**
16+
>
17+
> Your app's network is given a name based on the "project name",
1618
> which is based on the name of the directory it lives in. You can override the
1719
> project name with either the [`--project-name` flag](reference/overview.md)
1820
> or the [`COMPOSE_PROJECT_NAME` environment variable](reference/envvars.md#compose_project_name).
1921
2022
For example, suppose your app is in a directory called `myapp`, and your `docker-compose.yml` looks like this:
2123

22-
version: "3"
23-
services:
24-
web:
25-
build: .
26-
ports:
27-
- "8000:8000"
28-
db:
29-
image: postgres
30-
ports:
31-
- "8001:5432"
24+
```yaml
25+
version: "{{ site.compose_file_v3 }}"
26+
services:
27+
web:
28+
build: .
29+
ports:
30+
- "8000:8000"
31+
db:
32+
image: postgres
33+
ports:
34+
- "8001:5432"
35+
```
3236
3337
When you run `docker-compose up`, the following happens:
3438

compose/rails.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,29 @@ one's Docker image (the database just runs on a pre-made PostgreSQL image, and
6868
the web app is built from the current directory), and the configuration needed
6969
to link them together and expose the web app's port.
7070

71-
version: '3'
72-
services:
73-
db:
74-
image: postgres
75-
volumes:
76-
- ./tmp/db:/var/lib/postgresql/data
77-
environment:
78-
POSTGRES_PASSWORD: password
79-
web:
80-
build: .
81-
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
82-
volumes:
83-
- .:/myapp
84-
ports:
85-
- "3000:3000"
86-
depends_on:
87-
- db
88-
89-
>**Tip**: You can use either a `.yml` or `.yaml` extension for this file.
71+
```yaml
72+
version: "{{ site.compose_file_v3 }}"
73+
services:
74+
db:
75+
image: postgres
76+
volumes:
77+
- ./tmp/db:/var/lib/postgresql/data
78+
environment:
79+
POSTGRES_PASSWORD: password
80+
web:
81+
build: .
82+
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
83+
volumes:
84+
- .:/myapp
85+
ports:
86+
- "3000:3000"
87+
depends_on:
88+
- db
89+
```
90+
91+
> **Tip**
92+
>
93+
> You can use either a `.yml` or `.yaml` extension for this file.
9094

9195
### Build the project
9296

config/containers/live-restore.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ redirect_from:
77
---
88

99
By default, when the Docker daemon terminates, it shuts down running containers.
10-
Starting with Docker Engine 1.12, you can configure the daemon so that
11-
containers remain running if the daemon becomes unavailable. This functionality
12-
is called _live restore_. The live restore option helps reduce container
13-
downtime due to daemon crashes, planned outages, or upgrades.
10+
You can configure the daemon so that containers remain running if the daemon
11+
becomes unavailable. This functionality is called _live restore_. The live restore
12+
option helps reduce container downtime due to daemon crashes, planned outages,
13+
or upgrades.
1414

1515
> **Note**
1616
>

config/containers/resource_constraints.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ by viewing `/proc/<PID>/status` on the host machine.
167167
By default, each container's access to the host machine's CPU cycles is unlimited.
168168
You can set various constraints to limit a given container's access to the host
169169
machine's CPU cycles. Most users use and configure the
170-
[default CFS scheduler](#configure-the-default-cfs-scheduler). In Docker 1.13
171-
and higher, you can also configure the
172-
[realtime scheduler](#configure-the-realtime-scheduler).
170+
[default CFS scheduler](#configure-the-default-cfs-scheduler). You can also
171+
configure the [realtime scheduler](#configure-the-realtime-scheduler).
173172

174173
### Configure the default CFS scheduler
175174

@@ -180,31 +179,28 @@ the container's cgroup on the host machine.
180179

181180
| Option | Description |
182181
|:-----------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
183-
| `--cpus=<value>` | Specify how much of the available CPU resources a container can use. For instance, if the host machine has two CPUs and you set `--cpus="1.5"`, the container is guaranteed at most one and a half of the CPUs. This is the equivalent of setting `--cpu-period="100000"` and `--cpu-quota="150000"`. Available in Docker 1.13 and higher. |
184-
| `--cpu-period=<value>` | Specify the CPU CFS scheduler period, which is used alongside `--cpu-quota`. Defaults to 100000 microseconds (100 milliseconds). Most users do not change this from the default. If you use Docker 1.13 or higher, use `--cpus` instead. |
185-
| `--cpu-quota=<value>` | Impose a CPU CFS quota on the container. The number of microseconds per `--cpu-period` that the container is limited to before throttled. As such acting as the effective ceiling. If you use Docker 1.13 or higher, use `--cpus` instead. |
182+
| `--cpus=<value>` | Specify how much of the available CPU resources a container can use. For instance, if the host machine has two CPUs and you set `--cpus="1.5"`, the container is guaranteed at most one and a half of the CPUs. This is the equivalent of setting `--cpu-period="100000"` and `--cpu-quota="150000"`. |
183+
| `--cpu-period=<value>` | Specify the CPU CFS scheduler period, which is used alongside `--cpu-quota`. Defaults to 100000 microseconds (100 milliseconds). Most users do not change this from the default. For most use-cases, `--cpus` is a more convenient alternative. |
184+
| `--cpu-quota=<value>` | Impose a CPU CFS quota on the container. The number of microseconds per `--cpu-period` that the container is limited to before throttled. As such acting as the effective ceiling. For most use-cases, `--cpus` is a more convenient alternative. |
186185
| `--cpuset-cpus` | Limit the specific CPUs or cores a container can use. A comma-separated list or hyphen-separated range of CPUs a container can use, if you have more than one CPU. The first CPU is numbered 0. A valid value might be `0-3` (to use the first, second, third, and fourth CPU) or `1,3` (to use the second and fourth CPU). |
187186
| `--cpu-shares` | Set this flag to a value greater or less than the default of 1024 to increase or reduce the container's weight, and give it access to a greater or lesser proportion of the host machine's CPU cycles. This is only enforced when CPU cycles are constrained. When plenty of CPU cycles are available, all containers use as much CPU as they need. In that way, this is a soft limit. `--cpu-shares` does not prevent containers from being scheduled in swarm mode. It prioritizes container CPU resources for the available CPU cycles. It does not guarantee or reserve any specific CPU access. |
188187

189188
If you have 1 CPU, each of the following commands guarantees the container at
190189
most 50% of the CPU every second.
191190

192-
**Docker 1.13 and higher**:
193-
194191
```bash
195192
docker run -it --cpus=".5" ubuntu /bin/bash
196193
```
197-
198-
**Docker 1.12 and lower**:
194+
Which is the equivalent to manually specifying `--cpu-period` and `--cpu-quota`;
199195

200196
```bash
201197
$ docker run -it --cpu-period=100000 --cpu-quota=50000 ubuntu /bin/bash
202198
```
203199

204200
### Configure the realtime scheduler
205201

206-
In Docker 1.13 and higher, you can configure your container to use the
207-
realtime scheduler, for tasks which cannot use the CFS scheduler. You need to
202+
You can configure your container to use the realtime scheduler, for tasks which
203+
cannot use the CFS scheduler. You need to
208204
[make sure the host machine's kernel is configured correctly](#configure-the-host-machines-kernel)
209205
before you can [configure the Docker daemon](#configure-the-docker-daemon) or
210206
[configure individual containers](#configure-individual-containers).

config/pruning.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@ for more examples.
144144
## Prune everything
145145

146146
The `docker system prune` command is a shortcut that prunes images, containers,
147-
and networks. In Docker 17.06.0 and earlier, volumes are also pruned. In Docker
148-
17.06.1 and higher, you must specify the `--volumes` flag for
149-
`docker system prune` to prune volumes.
147+
and networks. Volumes are not pruned by default, and you must specify the
148+
`--volumes` flag for `docker system prune` to prune volumes.
150149

151150
```bash
152151
$ docker system prune
@@ -159,8 +158,7 @@ WARNING! This will remove:
159158
Are you sure you want to continue? [y/N] y
160159
```
161160

162-
If you are on Docker 17.06.1 or higher and want to also prune volumes, add
163-
the `--volumes` flag:
161+
To also prune volumes, add the `--volumes` flag:
164162

165163
```bash
166164
$ docker system prune --volumes

develop/develop-images/multistage-build.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ redirect_from:
66
- /engine/userguide/eng-image/multistage-build/
77
---
88

9-
Multi-stage builds are a new feature requiring Docker 17.05 or higher on the
10-
daemon and client. Multistage builds are useful to anyone who has struggled to
11-
optimize Dockerfiles while keeping them easy to read and maintain.
9+
Multistage builds are useful to anyone who has struggled to optimize Dockerfiles
10+
while keeping them easy to read and maintain.
1211

1312
> **Acknowledgment**:
1413
> Special thanks to [Alex Ellis](https://twitter.com/alexellisuk) for granting

docker-for-mac/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,5 +481,4 @@ After you have successfully authenticated, you can access your organizations and
481481
[Docker CLI Reference Guide](../engine/api/index.md){: target="_blank" rel="noopener" class="_"}.
482482

483483
* Check out the blog post, [What’s New in Docker 17.06 Community Edition
484-
(CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){:
485-
target="_blank" rel="noopener" class="_"}.
484+
(CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" rel="noopener" class="_"}.

engine/install/index.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ and **nightly**:
8989

9090
Year-month releases are made from a release branch diverged from the master
9191
branch. The branch is created with format `<year>.<month>`, for example
92-
`18.09`. The year-month name indicates the earliest possible calendar
92+
`19.03`. The year-month name indicates the earliest possible calendar
9393
month to expect the release to be generally available. All further patch
94-
releases are performed from that branch. For example, once `v18.09.0` is
95-
released, all subsequent patch releases are built from the `18.09` branch.
94+
releases are performed from that branch. For example, once `v19.03.0` is
95+
released, all subsequent patch releases are built from the `19.03` branch.
9696

9797
### Test
9898

@@ -114,10 +114,8 @@ format:
114114
where the time is the commit time in UTC and the final suffix is the prefix
115115
of the commit hash, for example `0.0.0-20180720214833-f61e0f7`.
116116

117-
These builds allow for testing from the latest code on the master branch.
118-
119-
> **Note:**
120-
> No qualifications or guarantees are made for the nightly builds.
117+
These builds allow for testing from the latest code on the master branch. No
118+
qualifications or guarantees are made for the nightly builds.
121119

122120
## Support
123121

engine/security/apparmor.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ administrator associates an AppArmor security profile with each program. Docker
1010
expects to find an AppArmor policy loaded and enforced.
1111

1212
Docker automatically generates and loads a default profile for containers named
13-
`docker-default`. On Docker versions `1.13.0` and later, the Docker binary generates
14-
this profile in `tmpfs` and then loads it into the kernel. On Docker versions
15-
earlier than `1.13.0`, this profile is generated in `/etc/apparmor.d/docker`
16-
instead.
13+
`docker-default`. The Docker binary generates this profile in `tmpfs` and then
14+
loads it into the kernel.
1715

1816
> **Note**: This profile is used on containers, _not_ on the Docker Daemon.
1917

engine/security/certificates.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ A custom certificate is configured by creating a directory under
2323
`/etc/docker/certs.d` using the same name as the registry's hostname, such as
2424
`localhost`. All `*.crt` files are added to this directory as CA roots.
2525

26-
> **Note**:
27-
> As of Docker 1.13, on Linux any root certificates authorities are merged
28-
> with the system defaults, including as the host's root CA set. On prior
29-
versions of Docker, and on Docker Enterprise Edition for Windows Server,
30-
> the system default certificates are only used when no custom root certificates
31-
> are configured.
26+
> **Note**
27+
>
28+
> On Linux any root certificates authorities are merged with the system defaults,
29+
> including the host's root CA set. If you are running Docker on Windows Server,
30+
> or Docker Desktop for Windows with Windows containers, the system default
31+
> certificates are only used when no custom root certificates are configured.
3232
3333
The presence of one or more `<filename>.key/cert` pairs indicates to Docker
3434
that there are custom certificates required for access to the desired

engine/security/trust/index.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ The following image depicts the various signing keys and their relationships:
8686

8787
![Content Trust components](images/trust_components.png)
8888

89-
> **WARNING**:
89+
> **WARNING**
90+
>
9091
> Loss of the root key is **very difficult** to recover from.
91-
>Correcting this loss requires intervention from [Docker
92-
>Support](https://support.docker.com) to reset the repository state. This loss
93-
>also requires **manual intervention** from every consumer that used a signed
94-
>tag from this repository prior to the loss.
92+
> Correcting this loss requires intervention from [Docker
93+
> Support](https://support.docker.com) to reset the repository state. This loss
94+
> also requires **manual intervention** from every consumer that used a signed
95+
> tag from this repository prior to the loss.
9596
{:.warning}
9697

9798
You should back up the root key somewhere safe. Given that it is only required
@@ -101,9 +102,6 @@ read how to [manage keys for DCT](trust_key_mng.md).
101102

102103
## Signing Images with Docker Content Trust
103104

104-
> **Note:**
105-
> This applies to Docker Community Engine 17.12 and newer.
106-
107105
Within the Docker CLI we can sign and push a container image with the
108106
`$ docker trust` command syntax. This is built on top of the Notary feature
109107
set, more information on Notary can be found [here](/notary/getting_started/).

engine/swarm/admin_guide.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,8 @@ you demote or remove a manager.
239239
## Back up the swarm
240240

241241
Docker manager nodes store the swarm state and manager logs in the
242-
`/var/lib/docker/swarm/` directory. In 1.13 and higher, this data includes the
243-
keys used to encrypt the Raft logs. Without these keys, you cannot restore the
244-
swarm.
242+
`/var/lib/docker/swarm/` directory. This data includes the keys used to encrypt
243+
the Raft logs. Without these keys, you cannot restore the swarm.
245244

246245
You can back up the swarm using any manager. Use the following procedure.
247246

@@ -377,11 +376,10 @@ balance across the swarm. When new tasks start, or when a node with running
377376
tasks becomes unavailable, those tasks are given to less busy nodes. The goal
378377
is eventual balance, with minimal disruption to the end user.
379378
380-
In Docker 1.13 and higher, you can use the `--force` or `-f` flag with the
381-
`docker service update` command to force the service to redistribute its tasks
382-
across the available worker nodes. This causes the service tasks to restart.
383-
Client applications may be disrupted. If you have configured it, your service
384-
uses a [rolling update](swarm-tutorial/rolling-update.md).
379+
You can use the `--force` or `-f` flag with the `docker service update` command
380+
to force the service to redistribute its tasks across the available worker nodes.
381+
This causes the service tasks to restart. Client applications may be disrupted.
382+
If you have configured it, your service uses a [rolling update](swarm-tutorial/rolling-update.md).
385383
386384
If you use an earlier version and you want to achieve an even balance of load
387385
across workers and don't mind disrupting running tasks, you can force your swarm

0 commit comments

Comments
 (0)