Skip to content

Commit a55ddf6

Browse files
author
Misty Stanley-Jones
authored
Move /engine/installation to /install (docker#5651)
* Move /engine/installation to /install * Add Docker for IBM Cloud to the matrix
1 parent c27fdb2 commit a55ddf6

108 files changed

Lines changed: 253 additions & 213 deletions

File tree

Some content is hidden

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

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ your work on that project's `vnext` branch.** These branches were created by
5555
cloning `master` and then importing a project's `master` branch's docs into it
5656
(at the time of the migration), in a way that preserved the commit history. When
5757
a project has a release, its `vnext` branch will be merged into `master` and your
58-
work will be visible on docs.docker.com.
58+
work will be visible on [https://docs.docker.com/](/).
5959

6060
The following `vnext` branches currently exist:
6161

@@ -122,7 +122,7 @@ know.
122122
## Style guide
123123

124124
If you have questions about how to write for Docker's documentation, have a look
125-
at the [style guide](https://docs.docker.com/opensource/doc-style/). The style
125+
at the [style guide](/opensource/doc-style/). The style
126126
guide provides guidance about grammar, syntax, formatting, styling, language, or
127127
tone. If something isn't clear in the guide, submit an issue to let us
128128
know or submit a pull request to help us improve it.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ help. If a reviewer realizes you have based your work on the wrong branch, we'll
3333
let you know so that you can rebase it.
3434

3535
>**Note**: To contribute code to Docker projects, see the
36-
[Contribution guidelines](https://docs.docker.com/opensource/project/who-written-for/).
36+
[Contribution guidelines](/opensource/project/who-written-for/).
3737

3838
### Files not edited here
3939

@@ -117,7 +117,7 @@ You have three options:
117117
```
118118

119119
If you haven't got Docker Compose installed,
120-
[follow these installation instructions](https://docs.docker.com/compose/install/).
120+
[follow these installation instructions](/compose/install/).
121121
122122
The container runs in the background and incrementally rebuilds the site each
123123
time a file changes. You can keep your browser open to http://localhost:4000/
@@ -250,7 +250,7 @@ no_ratings: true
250250
251251
### Creating tabs
252252
253-
The use of tabs, as on pages like https://docs.docker.com/engine/api/, requires
253+
The use of tabs, as on pages like [https://docs.docker.com/engine/api/](/engine/api/), requires
254254
the use of HTML. The tabs use Bootstrap CSS/JS, so refer to those docs for more
255255
advanced usage. For a basic horizontal tab set, copy/paste starting from this
256256
code and implement from there. Keep an eye on those `href="#id"` and `id="id"`
@@ -292,7 +292,7 @@ images, see the [README in the publish-tools branch](https://github.com/docker/d
292292
- The `master` branch has a Dockerfile which uses the static HTML from each
293293
archive image, in combination with the Markdown
294294
files in `master` and some upstream resources which are fetched at build-time,
295-
to create the full site at https://docs.docker.com/. All
295+
to create the full site at [https://docs.docker.com/](/). All
296296
of the long-running branches, such as `vnext-engine`, `vnext-compose`, etc,
297297
use the same logic.
298298

‎_data/redirects.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ source,destination
88
/articles/,/engine/articles/
99
/examples/,/engine/examples/
1010
/extend/,/engine/extend/
11-
/installation/,/engine/installation/
11+
/installation/,/install/
1212
/introduction/,/engine/introduction/
1313
/misc/,/engine/misc/
1414
/project/,/opensource/project/
1515
/reference/,/engine/reference/
1616
/security/,/engine/security/
1717
/static_files/,/engine/static_files/
1818
/userguide/,/engine/userguide/
19-
/en/latest/installation/,/engine/installation/
19+
/en/latest/installation/,/install/
2020
/docker-hub-enterprise/install/,/docker-trusted-registry/install/
2121
/docker-io/builds/,/docker-hub/builds/
2222
/docker-trusted-registry/license/install-csengine.md,/docker-trusted-registry/install/install-csengine/
2323
/engine/articles/basics/,/engine/userguide/basics/
2424
/engine/project/set-up-git/,/opensource/project/set-up-git/
2525
/engine/reference/articles/basics.md,/engine/userguide/basics/
2626
/engine/userguide/dockerlinks/,/engine/userguide/networking/default_network/dockerlinks/
27-
/installation/,/engine/installation/
27+
/installation/,/install/
2828
/networking/,/engine/userguide/networking/
2929
/opensource/project/advanced-contributing/,/opensource/workflow/advanced-contributing/
3030
/opensource/project/create-pr/,/opensource/workflow/create-pr/

‎_data/toc.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,45 @@ horizontalnav:
1818
guides:
1919
- sectiontitle: Get Docker
2020
section:
21-
- path: /engine/installation/
21+
- path: /install/
2222
title: Install Docker
2323
- sectiontitle: Docker EE
2424
section:
25-
- path: /engine/installation/windows/docker-ee/
25+
- path: /install/windows/docker-ee/
2626
title: Windows Server
27-
- path: /engine/installation/linux/docker-ee/ubuntu/
27+
- path: /install/linux/docker-ee/ubuntu/
2828
title: Ubuntu
29-
- path: /engine/installation/linux/docker-ee/rhel/
29+
- path: /install/linux/docker-ee/rhel/
3030
title: RHEL
31-
- path: /engine/installation/linux/docker-ee/centos/
31+
- path: /install/linux/docker-ee/centos/
3232
title: CentOS
33-
- path: /engine/installation/linux/docker-ee/oracle/
33+
- path: /install/linux/docker-ee/oracle/
3434
title: Oracle Linux
35-
- path: /engine/installation/linux/docker-ee/suse/
35+
- path: /install/linux/docker-ee/suse/
3636
title: SLES
3737
- sectiontitle: Docker CE
3838
section:
3939
- path: /docker-for-mac/install/
4040
title: Mac
4141
- path: /docker-for-windows/install/
4242
title: Windows
43-
- path: /engine/installation/linux/docker-ce/ubuntu/
43+
- path: /install/linux/docker-ce/ubuntu/
4444
title: Ubuntu
45-
- path: /engine/installation/linux/docker-ce/debian/
45+
- path: /install/linux/docker-ce/debian/
4646
title: Debian
47-
- path: /engine/installation/linux/docker-ce/centos/
47+
- path: /install/linux/docker-ce/centos/
4848
title: CentOS
49-
- path: /engine/installation/linux/docker-ce/fedora/
49+
- path: /install/linux/docker-ce/fedora/
5050
title: Fedora
51-
- path: /engine/installation/linux/docker-ce/binaries/
51+
- path: /install/linux/docker-ce/binaries/
5252
title: Binaries
5353
- sectiontitle: Platforms supporting Docker EE and Docker CE
5454
section:
55-
- path: /engine/installation/linux/centos/
55+
- path: /install/linux/centos/
5656
title: CentOS
57-
- path: /engine/installation/linux/ubuntu/
57+
- path: /install/linux/ubuntu/
5858
title: Ubuntu
59-
- path: /engine/installation/linux/linux-postinstall/
59+
- path: /install/linux/linux-postinstall/
6060
title: Optional Linux post-installation steps
6161
- sectiontitle: Docker Edge
6262
section:
@@ -1446,7 +1446,7 @@ manuals:
14461446
section:
14471447
- path: /enterprise/
14481448
title: About Docker EE
1449-
- path: /engine/installation/
1449+
- path: /install/
14501450
title: Install Docker EE
14511451
nosync: true
14521452
- title: Try Docker EE (no install)

‎_includes/docker_ce_ee.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
1+
{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
22

33
| Capabilities | Community Edition | Enterprise Edition Basic | Enterprise Edition Standard | Enterprise Edition Advanced |
44
|:------------------------------------------------------------------|:------------------|:-------------------------|:----------------------------|:----------------------------|

‎_includes/docker_cloud_matrix.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2-
{% assign install-prefix = '/engine/installation/linux' %}
1+
{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2+
{% assign install-prefix = '/install/linux' %}
33
| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE |
44
|:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------|
55
| [Amazon Web Services](/docker-for-aws/) | [{{ green-check }}](/docker-for-aws/) | | [{{ green-check }}](/docker-for-aws/) |
66
| [Microsoft Azure](/docker-for-azure/) | [{{ green-check }}](/docker-for-azure/) | | [{{ green-check }}](/docker-for-azure/) |
7+
| [IBM Cloud (Beta)](/docker-for-ibm-cloud/) | | | [{{ green-check }}](/docker-for-ibm-cloud/) |

‎_includes/docker_desktop_matrix.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2-
{% assign install-prefix = '/engine/installation/linux' %}
1+
{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2+
{% assign install-prefix = '/install/linux' %}
33
| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE |
44
|:----------------------------------------------------------------------|:-------------------------------------------------------------|:--------------------------------------------------------------|:-------------------------------------------------------------|
55
| [Docker for Mac (macOS)](/docker-for-mac/install.md) | [{{ green-check }}](/docker-for-mac/install.md) |

‎_includes/docker_platform_matrix.md‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
{% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2-
{% assign install-prefix = '/engine/installation/linux' %}
3-
4-
| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE ARM64 | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Z (s390x) |
5-
|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------|
6-
| [CentOS]({{ install-prefix }}/centos/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos/) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos/) | |
7-
| [Debian]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian/) | | | |
8-
| [Fedora]({{ install-prefix }}/docker-ce/fedora/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora/) | | | | | |
9-
| [Microsoft Windows Server 2016](/engine/installation/windows/docker-ee/) | | | | | [{{ green-check }}](/engine/installation/windows/docker-ee/) | |
10-
| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle/) | |
11-
| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel/) |
12-
| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse/) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse/) |
13-
| [Ubuntu]({{ install-prefix }}/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu/) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu/) |
1+
{% assign green-check = '![yes](/install/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %}
2+
{% assign install-prefix = '/install/linux' %}
3+
| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE IBM Power (ppc64le) | Docker CE IBM Z (s390x) | Docker EE x86_64 | Docker EE IBM Power (ppc64le) | Docker EE IBM Z (s390x) |
4+
|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------|:--------------------------------------------------------------|--------------------------------------------------------------|
5+
| [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md) | | |
6+
| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | | | | |
7+
| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md) | | | | | | |
8+
| [Microsoft Windows Server 2016](/install/windows/docker-ee.md) | | | | | [{{ green-check }}](/install/windows/docker-ee.md) | | |
9+
| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md) | | |
10+
| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) |
11+
| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md) | | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) |
12+
| [Ubuntu]({{ install-prefix }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md)|
1413

1514
> Limitations for Docker EE on IBM Power architecture
1615
>

0 commit comments

Comments
 (0)