docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

404 fix for Safari

This commit is contained in:
John Mulhausen 2016-10-07 11:48:26 -07:00
parent 539fcb58b7
commit 1bf7e04b35
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
404.md
View File

@ -61,9 +61,11 @@ function doFwd() {
if (gonnaFwd) { if (gonnaFwd) {
console.log("Forwarding to: " + newURL); console.log("Forwarding to: " + newURL);
window.location.replace(newURL); window.location.replace(newURL);
window.location = newURL;
document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">') document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
} else { } else {
window.location.replace("/sorry/#" + forwardingURL); window.location.replace("/sorry/#" + forwardingURL);
window.location = "/sorry/#" + forwardingURL;
document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">') document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
} }
} }

2
_layouts/docs.html
View File

@ -191,7 +191,7 @@ ng\:form {
</div> </div>
<div {% if page.notoc %} class="col-xs-12 col-sm-9 col-md-10" {% else %} class="col-xs-12 col-sm-9 col-md-8 col-xl-9" {% endif %} > <div {% if page.notoc %} class="col-xs-12 col-sm-9 col-md-10" {% else %} class="col-xs-12 col-sm-9 col-md-8 col-xl-9" {% endif %} >
<section class="section" id="DocumentationText"> <section class="section" id="DocumentationText">
{{ content }} {{ content | markdownify }}
{% if page.noratings != true %} {% if page.noratings != true %}
<div style="text-align: center; margin-top: 50px"> <div style="text-align: center; margin-top: 50px">
<img src="/images/chat.png" alt="chat icon" style="margin-right: 10px"> <img src="/images/chat.png" alt="chat icon" style="margin-right: 10px">

14
getting-started/part4.md
View File

@ -43,7 +43,7 @@ All we have to do to let Docker Cloud manage nodes for us on free-tier AWS is
create a service policy that grants certain permissions, and apply that to an create a service policy that grants certain permissions, and apply that to an
identity called a "role," using AWS's Identity and Access Management (IAM) tool. identity called a "role," using AWS's Identity and Access Management (IAM) tool.
- Go to [http://aws.amazon.com] and sign up for an account. It's free. - Go to [aws.amazon.com](https://aws.amazon.com) and sign up for an account. It's free.
- Go to [the IAM panel](https://console.aws.amazon.com/iam/home#policies) - Go to [the IAM panel](https://console.aws.amazon.com/iam/home#policies)
- Click **Create Policy**, then **Create Your Own Policy**. - Click **Create Policy**, then **Create Your Own Policy**.
- Name the policy `dockercloud-policy` and paste the following text in the - Name the policy `dockercloud-policy` and paste the following text in the
@ -86,7 +86,7 @@ So, let's do that now.
### Configure Docker Cloud to manage to your AWS instances ### Configure Docker Cloud to manage to your AWS instances
- Go to [http://cloud.docker.com](http://cloud.docker.com) and sign in with the - Go to [cloud.docker.com](http://cloud.docker.com) and sign in with the
same Docker ID you used in [step 2](/getting-started/step2.md). same Docker ID you used in [step 2](/getting-started/step2.md).
- Click **Settings**, and in the Cloud Providers section, click the plug icon. - Click **Settings**, and in the Cloud Providers section, click the plug icon.
- Enter the Role ARN string you copied earlier, e.g. `arn:aws:iam::123456789123:role/dockercloud-role`. - Enter the Role ARN string you copied earlier, e.g. `arn:aws:iam::123456789123:role/dockercloud-role`.
@ -97,6 +97,16 @@ into a swarm.
## Creating your first Swarm cluster ## Creating your first Swarm cluster
1. Go back to Docker Cloud by visiting [cloud.docker.com](https://cloud.docker.com).
2. Click **Node Clusters** in the left-navigation, then click the **Create** button.
This pulls up a form where you can create our cluster.
3. Leave everything default, except:
- Name: Give your cluster a name.
- Region: Select a region that's close to you.
- Provider: Set to "Amazon Web Services"
- Type/Size:
4. Launch the cluster by clicking **Launch node cluster**, and
5.
[On to next >>](part5.md){: class="button darkblue-btn"} [On to next >>](part5.md){: class="button darkblue-btn"}