Skip to content

Commit 9867c1c

Browse files
Fix download urls (docker#6559)
* Fix download urls
1 parent 16ea522 commit 9867c1c

File tree

2 files changed

+13
-151
lines changed

2 files changed

+13
-151
lines changed

docker-for-mac/install.md

+7-84
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,11 @@ keywords: mac, beta, alpha, install, download
44
title: Install Docker for Mac
55
---
66

7-
Docker for Mac is a [Docker Community Edition (CE)](https://www.docker.com/community-edition) app. The Docker for Mac
8-
install package includes everything you need to run Docker on a Mac. This topic
9-
describes pre-install considerations, and how to download and install Docker for
10-
Mac.<br><br>
11-
12-
> **Already have Docker for Mac?** If you already have
13-
Docker for Mac installed, and are ready to get started, skip to
14-
[Get started with Docker for Mac](index.md) for a quick tour of
15-
the command line, preferences, and tools.
16-
17-
>**Looking for Release Notes?** Get release notes for [Stable](release-notes.md)
18-
>and [Edge](edge-release-notes.md) releases.
19-
20-
## Download Docker for Mac
21-
22-
If you have not already done so, install Docker for Mac. You can download
23-
installers from the Stable or beta channel.
24-
25-
Both Stable and Edge installers come with <a
26-
href="https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md">
27-
experimental features in Docker Engine</a> enabled by default and configurable
28-
on [Docker Daemon
29-
preferences](index.md#daemon-experimental-mode) for experimental
30-
mode. We recommend that you disable experimental features for apps in
31-
production.
32-
33-
On both channels, we welcome your <a
34-
href="troubleshoot/#diagnose-problems-send-feedback-and-create-github-issues">feedback</a>
35-
to help us as the apps evolve.
36-
37-
For more about Stable and Edge channels, see the
38-
[FAQs](faqs.md#stable-and-edge-channels).
39-
40-
<table style="width:100%">
41-
<tr>
42-
<th style="font-size: x-large; font-family: arial">Stable channel</th>
43-
<th style="font-size: x-large; font-family: arial">Edge channel</th>
44-
</tr>
45-
<tr valign="top">
46-
<td width="50%">This installer is fully baked and tested. This is the
47-
best channel to use if you want a reliable platform to work with. These releases follow the Docker Engine stable releases.<br><br>
48-
On this channel, you can select whether to send usage
49-
statistics and other data. <br><br>Stable builds are released once per quarter.
50-
</td>
51-
<td width="50%">This installer provides the latest Edge release of
52-
Docker for Mac and Engine, and typically offers new features in development. Use this channel if you want to get experimental features faster, and can weather some instability and bugs. We collect all usage data on Edge releases across the board. <br><br>Edge builds are released once per month.
53-
</td>
54-
</tr>
55-
<tr valign="top">
56-
<td width="50%">
57-
<a class="button outline-btn" href="https://download.docker.com/mac/stable/Docker.dmg">Get Docker for Mac (Stable)</a>
58-
</td>
59-
<td width="50%">
60-
<a class="button outline-btn" href="https://download.docker.com/mac/edge/Docker.dmg">Get Docker for Mac (Edge)</a>
61-
</td>
62-
</tr>
63-
<tr valign="top">
64-
<td width="50%">
65-
<a href="https://download.docker.com/mac/stable/Docker.dmg.sha256sum"><font color="#BDBDBD" size="-1">Checksum: Docker.dmg SHA256</font></a>
66-
</td>
67-
<td width="50%">
68-
<a href="https://download.docker.com/mac/edge/Docker.dmg.sha256sum"><font color="#BDBDBD" size="-1">Checksum: Docker.dmg SHA256</font></a>
69-
</td>
70-
</tr>
71-
</table>
72-
73-
* Docker for Mac requires OS X El Capitan 10.11 or newer macOS release running on a 2010 or newer Mac, with Intel's hardware support for MMU virtualization.
74-
The app runs on 10.10.3 Yosemite, but with limited support. See [What
75-
to know before you install](#what-to-know-before-you-install) for a full
76-
explanation and list of prerequisites.
77-
78-
* You can switch between Edge and Stable versions, but you must have only one
79-
app installed at a time. Also, you need to save images and export
80-
containers you want to keep before uninstalling the current version before
81-
installing another. For more about this, see the
82-
[FAQs about Stable and Edge channels](faqs.md#stable-and-edge-channels).
7+
Docker for Mac is the
8+
[Community Edition (CE)](https://www.docker.com/community-edition)
9+
of Docker for MacOS. To download Docker for Mac, head to Docker Store.
10+
11+
[Download from Docker Store](https://store.docker.com/editions/community/docker-ce-desktop-mac){: .button .outline-btn}
8312

8413
## What to know before you install
8514

@@ -156,10 +85,8 @@ for Docker for Mac, and how the two products can coexist.
15685

15786
![Startup information](images/mac-install-success-docker-cloud.png)
15887

159-
3. Click the whale (![whale menu](images/whale-x.png){: .inline}) to get Preferences and other options.
160-
161-
![Docker context menu](images/menu/menu.png)
162-
88+
3. Click the whale (![whale menu](images/whale-x.png){: .inline}) to get
89+
Preferences and other options.
16390
4. Select **About Docker** to verify that you have the latest version.
16491

16592
Congratulations! You are up and running with Docker for Mac.
@@ -169,14 +96,10 @@ Congratulations! You are up and running with Docker for Mac.
16996
* [Getting started](index.md) provides an overview of Docker for Mac, basic
17097
Docker command examples, how to get help or give feedback, and links to all
17198
topics in the Docker for Mac guide.
172-
17399
* [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how
174100
to run and submit diagnostics, and submit issues.
175-
176101
* [FAQs](faqs.md) provides answers to frequently asked questions.
177-
178102
* [Release Notes](release-notes.md) lists component updates, new features, and
179103
improvements associated with Stable releases (or [Edge Release
180104
Notes](edge-release-notes.md)).
181-
182105
* [Get Started with Docker](/get-started/) provides a general Docker tutorial.

docker-for-windows/install.md

+6-67
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,12 @@ keywords: windows, beta, edge, alpha, install, download
44
title: Install Docker for Windows
55
---
66

7-
Docker for Windows is a desktop application based on
8-
[Docker Community Edition (CE)](https://www.docker.com/community-edition).
9-
The Docker for Windows install package includes everything you need to run
10-
Docker on a Windows system.
11-
12-
> For **Windows Server on Docker Enterprise Edition**, see [Install Docker Enterprise Edition for Windows Server](/install/windows/docker-ee.md).
13-
14-
## Download Docker for Windows
15-
16-
You can download Docker for Windows installers from the **Stable** or **Edge** channel.
17-
18-
Both Stable and Edge installers come with <a
19-
href="https://github.com/docker/cli/blob/master/experimental/README.md">
20-
experimental features in Docker Engine</a> enabled by default. Experimental mode can be toggled on/off on the Daemon tab of the [Settings dialog](index.md#daemon-experimental-mode).
21-
22-
For more about Stable and Edge channels, see the [FAQs](faqs.md#questions-about-stable-and-edge-channels).
23-
24-
<table style="width:100%">
25-
<tr>
26-
<th style="font-size: x-large; font-family: arial">Stable channel</th>
27-
<th style="font-size: x-large; font-family: arial;">Edge channel</th>
28-
</tr>
29-
<tr valign="top">
30-
<td width="33%">Stable is the best channel to use if you want a reliable platform to work with. Stable releases track the Docker platform stable releases.<br><br>
31-
On this channel, you can select whether to send usage statistics and other data. <br><br>Stable releases happen once per quarter.
32-
</td>
33-
<td width="33%">Use the Edge channel if you want to get experimental features faster, and can weather some instability and bugs. We collect usage data on Edge releases. <br><br>Edge builds are released once per month.
34-
</td>
35-
</tr>
36-
<tr valign="top">
37-
<td width="33%">
38-
<a class="button outline-btn" href="https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe">Get Docker for Windows (Stable)</a>
39-
</td>
40-
<td width="33%">
41-
<a class="button outline-btn" href="https://download.docker.com/win/edge/Docker%20for%20Windows%20Installer.exe">Get Docker for Windows (Edge)</a>
42-
</td>
43-
</tr>
44-
<tr valign="top">
45-
<td width="33%"><a href="https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe.sha256sum"><font color="#BDBDBD" size="-1">Checksum: Stable installer SHA256</font></a>
46-
</td>
47-
<td width="33%"><a href="https://download.docker.com/win/edge/Docker%20for%20Windows%20Installer.exe.sha256sum"><font color="#BDBDBD" size="-1">Checksum: Edge installer SHA256</font></a>
48-
</td>
49-
</tr>
50-
</table>
51-
52-
* Legacy (`.msi`) installers are available for [Edge](https://download.docker.com/win/edge/InstallDocker.msi) and [Stable](https://download.docker.com/win/stable/InstallDocker.msi) channels.
53-
54-
* Docker for Windows is designed to configure Docker development environments on Windows 10. You can develop both _Docker Linux_ containers and _Docker Windows_ containers. To run Docker Windows containers in production, see [Install Docker Enterprise Edition for Windows Server](/install/windows/docker-ee.md). To run Docker Linux containers in production, see [Install Docker](/install/index.md).
55-
56-
* Docker for Windows requires 64-bit Windows 10 Pro with Hyper-V available. See [What to know before you install](install.md#what-to-know-before-you-install) for a full list
57-
of prerequisites.
58-
59-
* You can switch between Edge and Stable versions, but you can only have one app
60-
installed at a time. Also, you need to save images and export containers you
61-
want to keep before uninstalling the current version before installing another.
62-
For more about this, see the [FAQs about Stable and Edge channels](faqs.md#questions-about-stable-and-edge-channels).
7+
Docker for Windows is the
8+
[Community Edition (CE)](https://www.docker.com/community-edition)
9+
of Docker for Microsoft Windows. To download Docker for Windows, head to Docker
10+
Store.
11+
12+
[Download from Docker Store](https://store.docker.com/editions/community/docker-ce-desktop-windows){: .button .outline-btn}
6313

6414
## What to know before you install
6515

@@ -73,34 +23,27 @@ remain. VirtualBox VMs created with `docker-machine` (including the `default`
7323
one typically created during Toolbox install) no longer start. These VMs
7424
cannot be used side-by-side with Docker for Windows. However, you can still use
7525
`docker-machine` to manage remote VMs.
76-
<p />
7726
* Virtualization must be enabled in BIOS and CPU SLAT-capable. Typically, virtualization is enabled by default. This is different from having Hyper-V enabled. For more
7827
detail see [Virtualization must be
7928
enabled](troubleshoot.md#virtualization-must-be-enabled) in Troubleshooting.
80-
<p />
8129
* The current version of Docker for Windows runs on 64bit Windows 10 Pro, Enterprise and Education (1607 Anniversary Update, Build 14393 or later).
82-
<p />
8330
* Containers and images created with Docker for Windows are shared between all user accounts on machines where it is installed. This is because all
8431
Windows accounts use the same VM to build and run containers.
85-
<p />
8632
* Nested virtualization scenarios, such as running Docker for Windows
8733
on a VMWare or Parallels instance, might work, but come with no
8834
guarantees. For more information, see
8935
[Running Docker for Windows in nested virtualization scenarios](troubleshoot.md#running-docker-for-windows-in-nested-virtualization-scenarios)
90-
<p />
9136
* **What the Docker for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/), Docker CLI client, [Docker Compose](/compose/overview.md), [Docker Machine](/machine/overview.md), and [Kitematic](/kitematic/userguide.md).
9237

9338
### About Windows containers
9439

9540
Looking for information on using Windows containers?
9641

9742
* [Switch between Windows and Linux containers](index.md#switch-between-windows-and-linux-containers) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
98-
<p />
9943
* [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md)
10044
provides a tutorial on how to set up and run Windows containers on Windows 10 or
10145
with Windows Server 2016. It shows you how to use a MusicStore application with
10246
Windows containers.
103-
<p />
10447
* Docker Container Platform for Windows Server 2016 [articles and blog posts](https://www.docker.com/microsoft/) on the Docker website
10548

10649
## Install Docker for Windows desktop app
@@ -149,11 +92,7 @@ Congratulations! You are up and running with Docker for Windows.
14992
## Where to go next
15093

15194
* [Getting started](index.md) introduces Docker for Windows.
152-
15395
* [Get started with Docker](/get-started/) is a tutorial that teaches you how to deploy a multi-service stack.
154-
15596
* [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and how to get support.
156-
15797
* [FAQs](faqs.md) provides answers to frequently asked questions.
158-
15998
* [Stable Release Notes](release-notes.md) or [Edge Release Notes](edge-release-notes.md).

0 commit comments

Comments
 (0)