Skip to content

Commit

Permalink
Merge pull request moby#23658 from londoncalling/mac-win-install-updates
Browse files Browse the repository at this point in the history
install mac and win pared down, link to d4mac, d4win, getting started…
SvenDowideit authored Jun 17, 2016

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
2 parents 28768a6 + 5bc730e commit 2b865db
Showing 21 changed files with 131 additions and 776 deletions.
32 changes: 27 additions & 5 deletions docs/getstarted/index.md
Original file line number Diff line number Diff line change
@@ -10,15 +10,30 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_all"
parent = "engine_use"
weight="-80"
parent = "tutorial_getstart_menu"
weight="-1"
+++
<![end-metadata]-->


# Get Started with Docker

This tutorial is a for non-technical users who are interested in learning more about Docker. By following these steps, you'll learn fundamental Docker features while working through some simple tasks. You'll learn how to:
This tutorial is a for non-technical users who are interested in learning more about Docker. By following these steps, you'll learn fundamental Docker features while working through some simple tasks.

Depending on how you got here, you may or may not have already downloaded Docker for your platform and installed it.

## Got Docker?

If you haven't yet downloaded Docker for your platform or installed it, go to [Get Docker](step_one.md#step-1-get-docker).

## Ready to start working with Docker?

If you have already downloaded and installed Docker, you are ready to run Docker commands! Go to [Verify your installation](step_one.md#step-3-verify-your-installation).


### What you'll learn and do

You'll learn how to:

* install Docker software for your platform
* run a software image in a container
@@ -30,10 +45,17 @@ This tutorial is a for non-technical users who are interested in learning more a

The getting started was user tested to reduce the chance of users having problems. For the best chance of success, follow the steps as written the first time before exploring on your own. It takes approximately 45 minutes to complete.

## Flavors of Docker

This tutorial is designed as a getting started with Docker, and works the same whether you are using Docker for Mac, Docker for Windows, Docker on Linux, or Docker Toolbox (for older Mac and Windows systems).

If you are using Docker Toolbox, you can use the Docker Quickstart Terminal to run Docker commands in a pre-configured environment instead of opening a command line terminal.

If you are using Docker for Mac, Docker for Windows, or Docker on Linux, you will have Docker running in the background, and your standard command line terminal is already set up to run Docker commands.

### Make sure you understand...
## How much command line savvy do I need?

This getting started uses Docker Engine CLI commands entered on the command line of a terminal window. You don't need to be a wizard at the command line, but you should be familiar with how to open your favorite shell or terminal, and run basic commands in that environment. It helps (but isn't required) to know how to navigate a directory tree, manipulate files, list running process, and so forth.
The getting started tour uses Docker Engine CLI commands entered on the command line of a terminal window. You don't need to be a wizard at the command line, but you should be familiar with how to open your favorite shell or terminal, and run basic commands in that environment. It helps (but isn't required) to know how to navigate a directory tree, manipulate files, list running process, and so forth.


Go to [the next page to install](step_one.md).
6 changes: 3 additions & 3 deletions docs/getstarted/last_page.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_learn_more"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 7
+++
<![end-metadata]-->
@@ -33,8 +33,8 @@ Depending on your interest, the Docker documentation contains a wealth of inform
<td class="tg-031e">[Getting Started with Docker for Mac](/docker-for-mac/index.md)</td>
</tr>
<tr>
<td class="tg-031e">More about Docker for Windows, More about Docker for Windows, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
<td class="tg-031e">[Getting Started with Docker for Windows](/docker-for-mac/index.md)</td>
<td class="tg-031e">More about Docker for Windows, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
<td class="tg-031e">[Getting Started with Docker for Windows](/docker-for-windows/index.md)</td>
</tr>
<tr>
<td class="tg-031e">More about Docker Toolbox</td>
2 changes: 1 addition & 1 deletion docs/getstarted/linux_install_help.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ title = "Install Docker and run hello-world"
description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker, install"]
identifier = "getstart_linux_install"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight="-80"
+++
<![end-metadata]-->
16 changes: 16 additions & 0 deletions docs/getstarted/menu.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!--[metadata]>
+++
aliases = [
]
title = "Get Started with Docker"
description = "Docker Mac"
keywords = ["beginner, getting started, Docker"]
type = "menu"
[menu.main]
identifier = "tutorial_getstart_menu"
parent = "engine_use"
weight = -80
+++
<![end-metadata]-->

# Get Started with Docker
2 changes: 1 addition & 1 deletion docs/getstarted/step_five.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_docker_hub"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 5
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/getstarted/step_four.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_build_image"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 4
+++
<![end-metadata]-->
22 changes: 12 additions & 10 deletions docs/getstarted/step_one.md
Original file line number Diff line number Diff line change
@@ -10,13 +10,17 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker, install"]
[menu.main]
identifier = "getstart_all_install"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 1
+++
<![end-metadata]-->

# Install Docker

- [Step 1: Get Docker](#step-1-get-docker)
- [Step 2: Install Docker](#step-2-install-docker)
- [Step 3: Verify your installation](#step-3-verify-your-installation)

## Step 1: Get Docker

### Docker for Mac
@@ -25,7 +29,7 @@ Docker for Mac is our newest offering for the Mac. It runs as a native Mac appli

<a class="button" href="https://download.docker.com/mac/beta/Docker.dmg">Get Docker for Mac</a>

#### Install Prequisites
**Requirements**

- Mac must be a 2010 or newer model, with Intel's hardware support for memory management unit (MMU) virtualization; i.e., Extended Page Tables (EPT)

@@ -47,7 +51,7 @@ Docker for Windows is our newest offering for PCs. It runs as a native Windows a

<a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a>

#### Install Prequisites
**Requirements**

* 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10.

@@ -66,21 +70,19 @@ For full instructions on getting Docker for various Linux distributions, see [In

## Step 2: Install Docker

* For install instructions for Docker for Mac, see [Getting Started with Docker for Mac](/docker-for-mac/index.md).

* For install instructions for Docker for Windows, see [Getting Started with Docker for Windows](/docker-for-windows/index.md).
- **Docker for Mac** - Install instructions are at [Getting Started with Docker for Mac](/docker-for-mac/index.md).

* For install instructions for Docker Toolbox, see [Docker Toolbox Overview](/toolbox/overview.md).
- **Docker for Windows** - Install instructions are at [Getting Started with Docker for Windows](/docker-for-windows/index.md).

* For a simple example of installing Docker on Ubuntu Linux so that you can work through this tutorial, see [Installing Docker on Ubuntu Linux (Example)](linux_install_help.md).
- **Docker Toolbox** - Install instructions are at [Docker Toolbox Overview](/toolbox/overview.md).

For full install instructions for Docker on Linux, see [Install Docker Engine](/engine/installation/index.md) and select the flavor of Linux you want to use.
- **Docker on Linux** - For a simple example of installing Docker on Ubuntu Linux so that you can work through this tutorial, see [Installing Docker on Ubuntu Linux (Example)](linux_install_help.md). Full install instructions for all flavors of Linux we support are at [Install Docker Engine](/engine/installation/index.md).

## Step 3: Verify your installation

1. Open a command-line terminal, and run some Docker commands to verify that Docker is working as expected.

Some good commands to try are `docker version` to check that you have the latest release installed and `docker ps` to see if you have any running containers. (Probably not, since you just started.)
Some good commands to try are `docker version` to check that you have the latest release installed and `docker ps` to see if you have any running containers. (Probably not, since you just started.)

2. Type the `docker run hello-world` command and press RETURN.

2 changes: 1 addition & 1 deletion docs/getstarted/step_six.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_tag_push_pull"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 6
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/getstarted/step_three.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_locate"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 3
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/getstarted/step_two.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
keywords = ["beginner, getting started, Docker"]
[menu.main]
identifier = "getstart_understand"
parent = "getstart_all"
parent = "tutorial_getstart_menu"
weight = 2
+++
<![end-metadata]-->
416 changes: 22 additions & 394 deletions docs/installation/mac.md

Large diffs are not rendered by default.

368 changes: 20 additions & 348 deletions docs/installation/windows.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/tutorials/dockerimages.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ title = "Build your own images"
description = "How to work with Docker images."
keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub, collaboration"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
weight = -4
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/tutorials/dockerizing.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ title = "Hello world in a container"
description = "A simple 'Hello world' exercise that introduced you to Docker."
keywords = ["docker guide, docker, docker platform, how to, dockerize, dockerizing apps, dockerizing applications, container, containers"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
weight=-6
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/tutorials/dockerrepos.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ title = "Store images on Docker Hub"
description = "Learn how to use the Docker Hub to manage Docker images and work flow"
keywords = ["repo, Docker Hub, Docker Hub, registry, index, repositories, usage, pull image, push image, image, documentation"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
+++
<![end-metadata]-->

2 changes: 1 addition & 1 deletion docs/tutorials/dockervolumes.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ title = "Manage data in containers"
description = "How to manage data inside your Docker containers."
keywords = ["Examples, Usage, volume, docker, documentation, user guide, data, volumes"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
+++
<![end-metadata]-->

3 changes: 1 addition & 2 deletions docs/tutorials/index.md
Original file line number Diff line number Diff line change
@@ -6,9 +6,8 @@ aliases = [
title = "Learn by example"
description = "Explains how to work with containers"
keywords = ["docker, introduction, documentation, about, technology, docker.io, user, guide, user's, manual, platform, framework, home, intro"]
[menu.main]
identifier="engine_learn"
parent = "engine_use"
parent = "engine_learn_menu"
weight="-80"
+++
<![end-metadata]-->
16 changes: 16 additions & 0 deletions docs/tutorials/menu.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!--[metadata]>
+++
aliases = [
]
title = "Learn by example"
description = "Explains how to work with containers"
keywords = ["docker, introduction, documentation, about, technology, docker.io, user, guide, user's, manual, platform, framework, home, intro"]
type = "menu"
[menu.main]
identifier = "engine_learn_menu"
parent = "engine_use"
weight = -79
+++
<![end-metadata]-->

# Learn by example
2 changes: 1 addition & 1 deletion docs/tutorials/networkingcontainers.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ title = "Network containers"
description = "How to network Docker containers."
keywords = ["Examples, Usage, volume, docker, documentation, user guide, data, volumes"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
weight = -3
+++
<![end-metadata]-->
2 changes: 1 addition & 1 deletion docs/tutorials/usingdocker.md
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ title = "Run a simple application"
description = "Learn how to manage and operate Docker containers."
keywords = ["docker, the docker guide, documentation, docker.io, monitoring containers, docker top, docker inspect, docker port, ports, docker logs, log, Logs"]
[menu.main]
parent = "engine_learn"
parent = "engine_learn_menu"
weight=-5
+++
<![end-metadata]-->
4 changes: 2 additions & 2 deletions docs/userguide/index.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!--[metadata]>
+++
title = "User guide"
title = "User Guide"
description = "How to use the Docker Engine user guide"
keywords = ["engine, introduction, documentation, about, technology, docker, user, guide, framework, home, intro"]
[menu.main]
parent="engine_use"
identifier = "engine_guide"
weight="-79"
weight="-78"
+++
<![end-metadata]-->

0 comments on commit 2b865db

Please sign in to comment.