Skip to content

Commit b06c458

Browse files
authored
Merge pull request docker#7685 from docker/backport-fixes
Backport fixes
2 parents 9c7e5b8 + 99d1555 commit b06c458

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

datacenter/dtr/2.5/guides/admin/upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to upgrade your Docker Trusted Registry
44
keywords: dtr, upgrade, install
55
---
66

7-
{% assign previous_version="2.3" %}
7+
{% assign previous_version="2.4" %}
88

99
DTR uses [semantic versioning](http://semver.org/) and we aim to achieve specific
1010
guarantees while upgrading between versions. We never support downgrading. We

get-started/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ By contrast, a **virtual machine** (VM) runs a full-blown "guest" operating
105105
system with _virtual_ access to host resources through a hypervisor. In general,
106106
VMs provide an environment with more resources than most applications need.
107107

108-
![Container stack example](https://www.docker.com/sites/default/files/Container%402x.png){:width="300px"} | ![Virtual machine stack example](https://www.docker.com/sites/default/files/VM%402x.png){:width="300px"}
108+
![Container stack example](/images/Container%402x.png){:width="300px"} | ![Virtual machine stack example](/images/VM%402x.png){:width="300px"}
109109

110110
## Prepare your Docker environment
111111

112-
Install a [maintained version](https://docs.docker.com/engine/installation/#updates-and-patches){: target="_blank" class="_"}
112+
Install a [maintained version](/engine/installation/#updates-and-patches){: target="_blank" class="_"}
113113
of Docker Community Edition (CE) or Enterprise Edition (EE) on a
114-
[supported platform](https://docs.docker.com/engine/installation/#supported-platforms){: target="_blank" class="_"}.
114+
[supported platform](/ee/supported-platforms/){: target="_blank" class="_"}.
115115

116116
> For full Kubernetes Integration
117117
>
@@ -150,7 +150,7 @@ is available in
150150
...
151151
```
152152

153-
> To avoid permission errors (and the use of `sudo`), add your user to the `docker` group. [Read more](https://docs.docker.com/engine/installation/linux/linux-postinstall/){: target="_blank" class="_"}.
153+
> To avoid permission errors (and the use of `sudo`), add your user to the `docker` group. [Read more](/engine/installation/linux/linux-postinstall/){: target="_blank" class="_"}.
154154

155155
### Test Docker installation
156156

@@ -213,7 +213,7 @@ docker container ls -aq
213213

214214
## Conclusion of part one
215215

216-
Containerization makes [CI/CD](https://www.docker.com/use-cases/cicd){: target="_blank" class="_"} seamless. For example:
216+
Containerization makes [CI/CD](https://www.docker.com/solutions/cicd){: target="_blank" class="_"} seamless. For example:
217217

218218
- applications have no system dependencies
219219
- updates can be pushed to any part of a distributed application

images/[email protected]

51.8 KB
Loading

images/[email protected]

55.3 KB
Loading

0 commit comments

Comments
 (0)