Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Go back to small /edge #2736

Merged
merged 5 commits into from
Apr 14, 2017
Merged

Go back to small /edge #2736

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12f2871
Go back to small /edge
Apr 11, 2017
4917ae9
Update site front page
Apr 13, 2017
69b34fd
Move logic of fetching content to a script
Apr 13, 2017
245340a
Add v1.28 API
Apr 13, 2017
5205beb
Add info about versioned API
Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update site front page 
Add info about Editions
Reorganize components
Update headings
  • Loading branch information
Misty Stanley-Jones committed Apr 13, 2017
commit 4917ae9c4fbf74f27c4b9907e7ccecd94578629c
127 changes: 88 additions & 39 deletions index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@ Fix docs bugs to claim the points, and cash in your points for prizes in [the sw

## Introduction to Docker


Docker packages your app with its dependencies, freeing you from worrying about
your system configuration, and making your app more portable.

## Docker CE Edge

The Docker CE Edge channel provides monthly releases which allow you to try
new features of Docker and verify bug fixes quickly. Edge releases are only
supported for one month, and a given Edge release will not receive any updates
once a new edge release is available.

[Learn more about Docker CE Edge](/edge/index.md)

<div class="row">
<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
### Learn Docker basics
Expand All @@ -53,7 +40,38 @@ environment. Highlights Compose Version 3 new features and swarm mode.
</div>
</div>

## Components
## Docker Editions

<div class="row">
<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">

### Docker Enterprise Edition

Designed for enterprise development and IT teams who build, ship, and run
business critical applications in production at scale. Integrated, certified,
and supported to provide enterprises with the most secure container platform in
the industry to modernize all applications. Docker EE Advanced comes with enterprise
[add-ons](#docker-ee-add-ons) like UCP and DTR.

[Learn more about Docker EE](/engine/installation/#platform-support-matrix){: class="button outline-btn"}
</div>

<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">

### Docker Community Edition

Get started with Docker and experimenting with container-based apps. Docker CE
is available on many platforms, from desktop to cloud to server. Build and share
containers and automate the development pipeline from a single environment.
Choose the Edge channel to get fast access to the latest features, or the Stable
channel for more predictability.

[Learn more about Docker EE](/engine/installation/#platform-support-matrix){: class="button outline-btn"}
</div>
</div><!-- end row -->


## Run Docker anywhere

<div class="component-container">
<!--start row-->
Expand Down Expand Up @@ -85,48 +103,49 @@ environment. Highlights Compose Version 3 new features and swarm mode.
<p>Install Docker on a computer which already has a Linux distribution installed.</p>
</div>
</div>
<!--organic row 2-->
<!--editions-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="engine/installation/"> <img src="../images/apple_48.svg" alt="Docker Editions"> </a>
</div>
<h3 id="editions"><a href="engine/installation/">Docker Editions</a></h3>
<p>Platform matrix and superset of installers for Docker for desktops, servers, or cloud providers.</p>
</div>
</div>
<!--compose-->
</div>

<div class="component-container">
<!--start row-->
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="compose/overview/"> <img src="../images/compose_48.svg" alt="Docker Compose"> </a>
<a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker Cloud"> </a>
</div>
<h3 id="compose"><a href="compose/overview/">Docker Compose</a></h3>
<p>Define application stacks built using multiple containers, services, and swarm configurations.</p>
<h3 id="docker-cloud"><a href="docker-cloud/">Docker Cloud</a></h3>
<p>A hosted service for building, testing, and deploying Docker images to your hosts.</p>
</div>
</div>
</div>
<!--machine-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="machine/overview/"> <img src="../images/machine_48.svg" alt="Docker Trusted Registry"> </a>
<a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker for AWS"> </a>
</div>
<h3 id="machine"><a href="machine/overview/">Docker Machine</a></h3>
<p>Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.</p>
<h3 id="docker-cloud-providers"><a href="/engine/installation/#platform-support-matrix">Docker for AWS</a></h3>
<p>Deploy your Docker apps on AWS.</p>
</div>
</div>
</div>
<!--organic row 3-->
<!--cloud-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker Cloud"> </a>
<a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker for Azure"> </a>
</div>
<h3 id="docker-cloud"><a href="docker-cloud/">Docker Cloud</a></h3>
<p>A hosted service for building, testing, and deploying Docker images to your hosts.</p>
<h3 id="docker-cloud-providers"><a href="/engine/installation/#platform-support-matrix">Docker for Azure</a></h3>
<p>Deploy your Docker apps on Azure.</p>
</div>
</div>
</div>
</div>

## Components

<h5>Docker EE Add-ons</h5>

<div class="component-container">
<!--start row-->
<div class="row">
<!--UCP-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
Expand All @@ -145,9 +164,39 @@ environment. Highlights Compose Version 3 new features and swarm mode.
</div>
<h3 id="dtr"><a href="datacenter/dtr/2.2/guides/">Docker Trusted Registry</a></h3>
<p>(DTR) An enterprise image storage solution you can install behind a firewall to manage images and access.</p>
</div>
</div>
</div>
<!-- end real row-->
</div>

<h5>Docker Tools</h5>

<div class="component-container">
<!--start row-->
<div class="row">
<!--compose-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="compose/overview/"> <img src="../images/compose_48.svg" alt="Docker Compose"> </a>
</div>
<h3 id="compose"><a href="compose/overview/">Docker Compose</a></h3>
<p>Define application stacks built using multiple containers, services, and swarm configurations.</p>
</div>
</div>
<!--machine-->
<div class="col-sm-12 col-md-12 col-lg-4 block">
<div class="component">
<div class="component-icon">
<a href="machine/overview/"> <img src="../images/machine_48.svg" alt="Docker Trusted Registry"> </a>
</div>
<h3 id="machine"><a href="machine/overview/">Docker Machine</a></h3>
<p>Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.</p>
</div>
</div>
</div>


<!-- end component-container 2-->
</div>