Skip to content

Commit

Permalink
Docker 17.03 release (docker#2050)
Browse files Browse the repository at this point in the history
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Update index.md

* Tabs CSS fixes and 12-factor reposition

* Theme Start (docker#1709)

* Hooking up nav to real TOC data, formatting fixes

* Fixing JS error

* Layout updates, dark themes, tons o stuff (docker#1971)

* Add cookie saving for day/night mode

* Newsite tabs (docker#2004)

* Layout updates, dark themes, tons o stuff

* Update themes

Theme updates + scaffolding

* Update style.css

* Update style-alt.css

* Missing font fixes

* Import Open Sans from Google

* Font fix, archive removal in TOC, favicon, Feedback img fix

* Oops, returning -webkit-font-smoothing: antialiased;

* Add old favicon.ico

* Make archives a non-tiered link

* Reorder docs archive to newest-first, add local instructions

* Commenting out day/night switch for now

* Fix 'rate this page'

* Rate this page fixes

* Autocomplete and Docker Cloud fixes

* Open tree to current page

* Adding indentation for nav collapse in

* Ensure left nav visibly displays the current topic

* Update flex layout

- adjust rescale
- code block styles

* add focus to search

- force code block color (for now)
- increase section max-width

* increase content padding

- add padding to toc for wrapping long strings.

* grid adjustment

- grid
- content and wrapper adjustments for mobile

* left/right sidebar adjustments

- refine position on scroll for toc on landing

- add default height to compensate for upcoming position absolute
onScroll

* side bar overflow

- hidden on X-scroll

* fix version button

- override bstrap defaults

* tabs + buttons

* update landing svgs

* fix sidebar height

set to 100% on landing pre-affix

* Update blurb about engine/editions on front page

* add side menu to mobile collapse menu

* update classnames

* overall mobile tweaks

* Right-nav highlighting and auto-scroll

* Slightly slower right-nav highlighting, correct version

* add toggle menus for small devices

* Fixing JS error/Docker 1.13>17.03

* header updates

* re-add fan to header

* update transition time

* Add first 20 words to Twitter card

* fixed width of components

- lockdown elements on rescale (wil need more TLC)

* set max-width of content

* Left and right nav resizing w/footer scroll and window resize

* update links on landing page

* Fix for overzealous resizing, JS redundancies

* Fix for JS error on homepage

* JS error fixes

* toggle adjustments

- wrap toggle button

* add tab width

* version button type

* version button both headers

* tabs - fix typo

* landing page grid

* components

* Share images, JS fixes, Marketo removal

* Anchor links fix

* Fix for black space on mobile

* Restore hamburger (partial)

* Update run.md

Minor grammar cleanup.

* Update apparmor.md

I'm a little confused about which one is better to be used here, a period (.) or a colon (:),  as a command is given below. Or both are OK, and we only have to keep consistency in a single page.

* Update apparmor.md

Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.

* Replacing service with secret

* Update networking.md

fix typo with triple "m" for command word

* Update run.md

Address PR feedback.

* Update install instructions to latest version

* Added "related topics" section

* Add documentation for mem_swappiness

* Update to new Docker version scheme (docker#1926)

* mem_swappiness for current version and v1

* merge other changes, fix typo

* There is no OpenSuSE and there never was

though we had SuSE and S.u.S.E.

* Add release notes for 1.12.6-cs9 (docker#2028)

Signed-off-by: Brian Goff <[email protected]>

* need sudo to access key cache (docker#1931)

* need sudo to access key cache

* List other keyservers to try for cs-engine install (docker#2033)

* List other keyservers to try for cs-engine install

Sometimes ha.pool.sks-keyservers.net goes down, so let's provide some
other keyservers to try in such cases.

Signed-off-by: Brian Goff <[email protected]>

* Update work_issue.md (docker#2030)

Change "re-start" to "restart". Though not included in "Prefered usages" in the documentation guide, but I think "restart" is better and used more frequently. Besides, some other docs here, such as "Keep containers alive during daemon downtime" of "Admin Guide", also use "restart".

* Update create_pr.md (docker#2015)

* Update work_issue.md (docker#2013)

Change "id" to "ID" except for those in code.

* Update set_up_dev.md (docker#2011)

Add periods (.) in some steps.

* Update set_up_dev.md (docker#2010)

Apply Oxford Comma as described in the documentation guide.

* Update create_pr.md (docker#2014)

Delete an extra space.

* Update trust_key_mng.md (docker#1883)

* Update trust_key_mng.md

* Update trust_key_mng.md

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update 

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update content_trust.md (docker#1912)

* Update content_trust.md

* update deprecation policy

Signed-off-by: Victor Vieux <[email protected]>

* Update info about how to check whether Docker is running

* Updated docs to reflect edge channel

Signed-off-by: French Ben <[email protected]>

* Updated wording for SP creation

Signed-off-by: French Ben <[email protected]>

* beta to edge, cloud features first draft

added cloud images

Signed-off-by: Victoria Bialas <[email protected]>

* Distinguish between cloud stack file and stack file

* Added EE links

Signed-off-by: French Ben <[email protected]>

* Use variables

Signed-off-by: French Ben <[email protected]>

* Replace deprecated MAINTAINER with LABEL (docker#1445)

Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in moby/moby#25466

* Updates for Docker CE and Docker EE

* Updated DDC launch button

Signed-off-by: French Ben <[email protected]>

* added Docker Cloud topics for Mac and Windows

Signed-off-by: Victoria Bialas <[email protected]>

* d4mac, d4win stable and beta release notes for 17.03.0

Signed-off-by: Victoria Bialas <[email protected]>
  • Loading branch information
Misty Stanley-Jones authored and johndmulhausen committed Mar 2, 2017
1 parent 61e9f0c commit 3108d86
Show file tree
Hide file tree
Showing 116 changed files with 7,670 additions and 1,700 deletions.
48 changes: 24 additions & 24 deletions _data/docsarchive/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
v1.4:
image: docs/docker.github.io:v1.4
v1.12:
image: docs/docker.github.io:v1.12
ports:
- "4014:4000"
v1.5:
image: docs/docker.github.io:v1.5
- "4112:4000"
v1.11:
image: docs/docker.github.io:v1.11
ports:
- "4015:4000"
v1.6:
image: docs/docker.github.io:v1.6
- "4111:4000"
v1.10:
image: docs/docker.github.io:v1.10
ports:
- "4016:4000"
v1.7:
image: docs/docker.github.io:v1.7
- "4110:4000"
v1.9:
image: docs/docker.github.io:v1.9
ports:
- "4017:4000"
- "4019:4000"
v1.8:
image: docs/docker.github.io:v1.8
ports:
- "4018:4000"
v1.9:
image: docs/docker.github.io:v1.9
v1.7:
image: docs/docker.github.io:v1.7
ports:
- "4019:4000"
v1.10:
image: docs/docker.github.io:v1.10
- "4017:4000"
v1.6:
image: docs/docker.github.io:v1.6
ports:
- "4110:4000"
v1.11:
image: docs/docker.github.io:v1.11
- "4016:4000"
v1.5:
image: docs/docker.github.io:v1.5
ports:
- "4111:4000"
v1.12:
image: docs/docker.github.io:v1.12
- "4015:4000"
v1.4:
image: docs/docker.github.io:v1.4
ports:
- "4112:4000"
- "4014:4000"
37 changes: 12 additions & 25 deletions _data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ guides:
- sectiontitle: Get Docker
section:
- path: /engine/installation/
title: Install Docker Engine
title: Install Docker
- path: /docker-for-mac/install/
title: Docker for Mac
- path: /docker-for-windows/install/
Expand All @@ -35,11 +35,11 @@ guides:
- path: /engine/installation/linux/fedora/
title: Fedora
- path: /engine/installation/linux/debian/
title: Debian or Raspbian
title: Debian
- path: /engine/installation/linux/oracle/
title: Oracle Linux
- path: /engine/installation/linux/suse/
title: OpenSuSE and SuSE Linux Enterprise
title: SuSE Linux Enterprise
- path: /engine/installation/linux/other/
title: Other Linux distributions
- path: /engine/installation/binaries/
Expand Down Expand Up @@ -446,28 +446,8 @@ guides:
title: Where to chat or get help
- path: /opensource/doc-style/
title: Style guide for Docker documentation
- sectiontitle: Docs archive
section:
- path: /docsarchive/
title: View the docs archives
- path: /v1.4
title: v1.4
- path: /v1.5
title: v1.5
- path: /v1.6
title: v1.6
- path: /v1.7
title: v1.7
- path: /v1.8
title: v1.8
- path: /v1.9
title: v1.9
- path: /v1.10
title: v1.10
- path: /v1.11
title: v1.11
- path: /v1.12
title: v1.12
- path: /docsarchive/
title: View the docs archives

reference:
- title: Dockerfile reference
Expand Down Expand Up @@ -889,6 +869,13 @@ samples:
title: WordPress

manuals:
- sectiontitle: Docker Enterprise Edition
section:
- path: /enterprise/
title: About Docker EE
- path: /engine/installation/
title: Install Docker EE
nosync: true
- sectiontitle: Commercially Supported Docker Engine
section:
- sectiontitle: 1.13
Expand Down
28 changes: 15 additions & 13 deletions _includes/d4a_buttons.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{% capture aws_button_latest %}
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-2" target="blank" class="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
{% endcapture %}
{% assign d4a_stable = "CE-Stable-1" %}
{% assign d4a_edge = "CE-Edge-1" %}
{% assign edition_version = "17.03.0-ce" %}


{% capture aws_blue_latest %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-2" target="blank">Deploy Docker for AWS (stable)</a>
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) for AWS (stable)</a>
{% endcapture %}

{% capture aws_blue_edge %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for AWS (beta)</a>
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) for AWS (edge)</a>
{% endcapture %}

{% capture aws_blue_vpc_latest %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker-no-vpc.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for AWS (stable)<br/><small>uses your existing VPC</small></a>
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker-no-vpc.tmpl" data-rel="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) for AWS (stable)<br/><small>uses your existing VPC</small></a>
{% endcapture %}

{% capture aws_blue_vpc_edge %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker-no-vpc.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for AWS (beta)<br/><small>uses your existing VPC</small></a>
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker-no-vpc.tmpl" data-rel="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) for AWS (edge)<br/><small>uses your existing VPC</small></a>
{% endcapture %}

{% capture azure_blue_latest %}
<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-2" target="blank">Deploy Docker for Azure (stable)</a>
<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="{{ d4a_stable }}" target="blank">Deploy Docker Community Edition (CE) for Azure (stable)</a>
{% endcapture %}

{% capture azure_blue_edge %}
<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fedge%2FDocker.tmpl" data-rel="Beta-18" target="blank">Deploy Docker for Azure (beta)</a>
<a class="button darkblue-btn azure-deploy" href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fedge%2FDocker.tmpl" data-rel="{{ d4a_edge }}" target="blank">Deploy Docker Community Edition (CE) for Azure (edge)</a>
{% endcapture %}
{% capture azure_button_latest %}
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-2" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
{% endcapture %}

17 changes: 17 additions & 0 deletions _includes/docker_platform_matrix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px"}{% endcapture %}

| Platform | Docker EE | Docker CE |
|:-------------------------------------------------------------------------------------|:-----------------:|:-----------------:|
| [Ubuntu](linux/ubuntulinux.md) | {{ green-check }} | {{ green-check }} |
| [Debian](linux/debian.md) | | {{ green-check }} |
| [Red Hat Enterprise Linux](linux/rhel.md) | {{ green-check }} | |
| [CentOS](linux/centos.md) | {{ green-check }} | {{ green-check }} |
| [Fedora](linux/fedora.md) | | {{ green-check }} |
| [Oracle Linux](linux/oracle.md) | {{ green-check }} | |
| [SUSE Linux Enterprise Server](linux/suse.md) | {{ green-check }} | |
| [Microsoft Windows Server 2016](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/quick-start-windows-server){: target="_blank" class="_" } | {{ green-check }} | |
| [Microsoft Windows 10](/docker-for-windows/)) | | {{ green-check }} |
| [macOS](/docker-for-mac/) | | {{ green-check }} |
| [Microsoft Azure](/docker-cloud/infrastructure/link-aws.md) | {{ green-check }} | {{ green-check }} |
| [Amazon Web Services](/docker-cloud/infrastructure/link-aws.md) | {{ green-check }} | {{ green-check }} |
{: style="width: 75%" }
111 changes: 111 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@

<div class="newsletter_section">
<div class="container">
<!-- newsletter
<div class="col-md-8">
<form class="form-inline">
<div class="form-group">
<input type="email" class="form-control input" placeholder="email address">
<button type="submit" class="button outline-btn newsletter">Submit</button>
</div>
</form>
</div>-->
</div>
</div>
<div class="container">
<div class="top_footer">
<div class="row">
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links">
<li><a href="https://www.docker.com/what-docker">What is Docker</a></li>
<li><a href="https://www.docker.com/what-container">What is a Container</a></li>
<li><a href="https://www.docker.com/use-cases">Use Cases</a></li>
<li><a href="https://www.docker.com/customers">Customers</a></li>
<li><a href="https://www.docker.com/partners/partner-program">Partners</a></li>
<li class="break"><a href="https://www.docker.com/industry-government">For Government</a></li>
<li><a href="https://www.docker.com/company">About Docker</a></li>
<li><a href="https://www.docker.com/company/management">Management</a></li>
<li><a href="https://www.docker.com/company/news-and-press">Press &amp; News</a></li>
<li><a href="https://www.docker.com/careers">Careers</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links">
<li><a href="https://www.docker.com/products/overview">Product</a></li>
<li><a href="https://www.docker.com/pricing">Pricing</a></li>
<li><a href="https://www.docker.com/docker-community">Community Edition</a></li>
<li class="break"><a href="https://www.docker.com/enterprise">Enterprise Edition </a></li>
<li><a href="https://www.docker.com/products/docker-datacenter">Docker Datacenter</a></li>
<li><a href="https://cloud.docker.com/">Docker Cloud</a></li>
<li><a href="https://store.docker.com/">Docker Store</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-3">
<ul class="footer_links">
<li><a href="https://www.docker.com/docker-mac">Docker for Mac </a></li>
<li class="break"><a href="https://www.docker.com/docker-windows">Docker for Windows(PC)</a></li>
<li><a href="https://www.docker.com/docker-aws" class="web30">Docker for AWS</a></li>
<li class="break"><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
<li><a href="https://www.docker.com/docker-windows-server">Docker for Windows Server</a></li>
<li><a href="https://www.docker.com/docker-centos">Docker for CentOS distribution</a></li>
<li><a href="https://www.docker.com/docker-debian">Docker for Debian</a></li>
<li><a href="https://www.docker.com/docker-fedora">Docker for Fedora&#x00AE</a></li>
<li><a href="https://www.docker.com/docker-oracle-linux">Docker for Oracle Enterprise Linux</a></li>
<li><a href="https://www.docker.com/docker-rhel">Docker for RHEL</a></li>
<li><a href="https://www.docker.com/docker-sles">Docker for SLES</a></li>
<li><a href="https://www.docker.com//docker-ubuntu">Docker for Ubuntu</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links">
<li><a href="https://docs.docker.com/">Documentation</a></li>
<li><a href="https://www.docker.com/docker">Learn</a></li>
<li><a href="https://blog.docker.com" target="_blank">Blog</a></li>
<li><a href="https://training.docker.com/" target="_blank">Training</a></li>
<li><a href="https://www.docker.com/docker-support-services">Support</a></li>
<li><a href="https://success.docker.com/kbase">Knowledge Base</a></li>
<li><a href="https://www.docker.com/products/resources">Resources</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links">
<li><a href="https://www.docker.com/docker-community">Community</a></li>
<li><a href="https://www.docker.com/technologies/overview">Open Source</a></li>
<li><a href="https://www.docker.com/community/events">Events</a></li>
<li><a href="https://forums.docker.com/" target="_blank">Forums</a></li>
<li><a href="https://www.docker.com/community/docker-captains">Docker Captians</a></li>
<li><a href="https://www.docker.com/docker-community/scholarships">Scholarships</a></li>
<li><a href="https://blog.docker.com/curated/">Community News</a></li>
</ul>
</div>
</div>
<div class="footer-nav">
<nav class="footer_sub_nav">
<ul class="menu">
<li><a href="http://status.docker.com/">Status</a></li>
<li><a href="https://www.docker.com/docker-security">Security</a></li>
<li><a href="https://www.docker.com/legal">Legal</a></li>
<li><a href="https://www.docker.com/company/contact">Contact</a></li>
</ul>
</nav>
</div>
</div>
<div class="bottom_footer">
<div class="footer-copyright">
<p class="copyright">
Copyright © 2017 Docker Inc. All rights reserved. </p>
</div>
<div class="footer_social_nav">
<ul class="nav-social">
<li class="fa fa-twitter"><a href="http://twitter.com/docker">Twitter</a></li>
<li class="fa fa-youtube"><a href="http://www.youtube.com/user/dockerrun">Youtube</a></li>
<li class="fa fa-google-plus"><a href="https://plus.google.com/u/0/communities/108146856671494713993">Google</a></li>
<li class="fa fa-github"><a href="https://github.com/docker/docker">Github</a></li>
<li class="fa fa-linkedin"><a href="https://www.linkedin.com/company/docker">Linkedin</a></li>
<li class="fa fa-facebook"><a href="https://www.facebook.com/docker.run">Facebook</a></li>
<li class="fa fa-reddit"><a href="http://www.reddit.com/r/docker">Reddit</a></li>
<li class="fa fa-slideshare"><a href="http://www.slideshare.net/docker">Slideshare</a></li>
</ul>
</div>
</div>
</div>
Loading

0 comments on commit 3108d86

Please sign in to comment.