Skip to content

Commit 4a833da

Browse files
johndmulhausenjohndmulhausen
committed
Checking in part 4 stopping place
2 parents 1bf7e04 + 68b813c commit 4a833da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+602
-450
lines changed

‎404.md

+5-16
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ permalink: /404.html
55
---
66

77
<script language="JavaScript">
8-
function doFwd() {
9-
var forwardingURL=window.location.href;
10-
var domainName = window.location.hostname;
11-
var portNumber = window.location.port;
8+
var forwardingURL=window.location.pathname;
9+
if (forwardingURL.charAt(forwardingURL.length - 1) != "/") forwardingURL += "/";
1210
var gonnaFwd = false;
1311
var newURL = "";
1412
console.log(forwardingURL);
@@ -49,25 +47,16 @@ function doFwd() {
4947
{
5048
console.log("Found via Docker Compose file for Acrhive")
5149
gonnaFwd = true;
52-
if(portNumber.length > 0) {
53-
// there is a port number in the location; make sure to replace it
54-
newURL = forwardingURL.replace(domainName + ":"+ portNumber +"/{{ item[0] }}","{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}");
55-
} else {
56-
// no port number in the location; just foward them on
57-
newURL = forwardingURL.replace(domainName + "/{{ item[0] }}","{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}");
58-
}
59-
newURL = newURL.replace("https:","http:")
50+
newURL = forwardingURL.replace("/{{ item[0] }}","{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}");
6051
}{% endfor %}
6152
if (gonnaFwd) {
6253
console.log("Forwarding to: " + newURL);
6354
window.location.replace(newURL);
64-
window.location = newURL;
55+
window.location.href = newURL;
6556
document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
6657
} else {
6758
window.location.replace("/sorry/#" + forwardingURL);
68-
window.location = "/sorry/#" + forwardingURL;
59+
window.location.href = "/sorry/#" + forwardingURL;
6960
document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
7061
}
71-
}
72-
window.onload = doFwd;
7362
</script>

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ defaults:
2525
type: "pages"
2626
values:
2727
layout: docs
28-
archiveserver: "54.71.194.30"
28+
archiveserver: "http://54.71.194.30"

‎_data/redirects.csv

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
source,destination
2-
engine/quickstart/,engine/getstarted/
3-
engine/containers/,engine/tutorials/
4-
win/,docker-for-windows/
5-
mac/,docker-for-mac/
6-
linux/,engine/
7-
article-img/,engine/article-img/
8-
articles/,engine/articles/
9-
examples/,engine/examples/
10-
extend/,engine/extend/
11-
installation/,engine/installation/
12-
introduction/,engine/introduction/
13-
misc/,engine/misc/
14-
project/,opensource/project/
15-
reference/,engine/reference/
16-
security/,engine/security/
17-
static_files/,engine/static_files/
18-
userguide/,engine/userguide/
19-
en/latest/installation/,engine/installation/
20-
docker-hub-enterprise/install/,docker-trusted-registry/install/
21-
docker-io/builds/,docker-hub/builds/
22-
docker-trusted-registry/license/install-csengine.md,docker-trusted-registry/install/install-csengine/
23-
engine/articles/basics/,engine/userguide/basics/
24-
engine/project/set-up-git/,opensource/project/set-up-git/
25-
engine/reference/articles/basics.md,engine/userguide/basics/
26-
engine/userguide/dockerlinks/,engine/userguide/networking/default_network/dockerlinks/
27-
installation/,engine/installation/
28-
networking/,engine/userguide/networking/
29-
opensource/project/advanced-contributing/,opensource/workflow/advanced-contributing/
30-
opensource/project/create-pr/,opensource/workflow/create-pr/
31-
opensource/project/find-an-issue/,opensource/workflow/find-an-issue/
32-
opensource/project/get-help/,opensource/get-help/
33-
opensource/project/make-a-contribution/,opensource/workflow/make-a-contribution/
34-
opensource/project/review-pr/,opensource/workflow/review-pr/
35-
opensource/project/work-issue/,opensource/workflow/work-issue/
36-
opensource/workflow/doc-style/,opensource/doc-style/
37-
opensource/workflow/get-help/,opensource/get-help/
38-
opensource/workflow/set-up-dev-env/,opensource/project/set-up-dev-env/
39-
opensource/workflow/set-up-git/,opensource/project/set-up-git/
40-
opensource/workflow/test-and-docs/,opensource/project/test-and-docs/
41-
userguide/,engine/userguide/
42-
docker-trusted-registry/adminguide/upgrade.md,docker-trusted-registry/install/upgrade/
43-
docker-trusted-registry/quick-start/install.md,docker-trusted-registry/install/
44-
docker-trusted-registry/adminguide/docker-trusted-registry/install.md,docker-trusted-registry/install/
45-
v1.6/docker-hub/,docker-hub/
46-
v1.7/docker-hub/,docker-hub/
47-
v1.8/docker-hub/,docker-hub/
48-
v1.9/docker-hub/,docker-hub/
49-
v1.10/docker-hub/,docker-hub/
50-
v1.11/docker-hub/,docker-hub/
1+
/source,destination
2+
/engine/quickstart/,/engine/getstarted/
3+
/engine/containers/,/engine/tutorials/
4+
/win/,/docker-for-windows/
5+
/mac/,/docker-for-mac/
6+
/linux/,/engine/
7+
/article-img/,/engine/article-img/
8+
/articles/,/engine/articles/
9+
/examples/,/engine/examples/
10+
/extend/,/engine/extend/
11+
/installation/,/engine/installation/
12+
/introduction/,/engine/introduction/
13+
/misc/,/engine/misc/
14+
/project/,/opensource/project/
15+
/reference/,/engine/reference/
16+
/security/,/engine/security/
17+
/static_files/,/engine/static_files/
18+
/userguide/,/engine/userguide/
19+
/en/latest/installation/,/engine/installation/
20+
/docker-hub-enterprise/install/,/docker-trusted-registry/install/
21+
/docker-io/builds/,/docker-hub/builds/
22+
/docker-trusted-registry/license/install-csengine.md,/docker-trusted-registry/install/install-csengine/
23+
/engine/articles/basics/,/engine/userguide/basics/
24+
/engine/project/set-up-git/,/opensource/project/set-up-git/
25+
/engine/reference/articles/basics.md,/engine/userguide/basics/
26+
/engine/userguide/dockerlinks/,/engine/userguide/networking/default_network/dockerlinks/
27+
/installation/,/engine/installation/
28+
/networking/,/engine/userguide/networking/
29+
/opensource/project/advanced-contributing/,/opensource/workflow/advanced-contributing/
30+
/opensource/project/create-pr/,/opensource/workflow/create-pr/
31+
/opensource/project/find-an-issue/,/opensource/workflow/find-an-issue/
32+
/opensource/project/get-help/,/opensource/get-help/
33+
/opensource/project/make-a-contribution/,/opensource/workflow/make-a-contribution/
34+
/opensource/project/review-pr/,/opensource/workflow/review-pr/
35+
/opensource/project/work-issue/,/opensource/workflow/work-issue/
36+
/opensource/workflow/doc-style/,/opensource/doc-style/
37+
/opensource/workflow/get-help/,/opensource/get-help/
38+
/opensource/workflow/set-up-dev-env/,/opensource/project/set-up-dev-env/
39+
/opensource/workflow/set-up-git/,/opensource/project/set-up-git/
40+
/opensource/workflow/test-and-docs/,/opensource/project/test-and-docs/
41+
/userguide/,/engine/userguide/
42+
/docker-trusted-registry/adminguide/upgrade.md,/docker-trusted-registry/install/upgrade/
43+
/docker-trusted-registry/quick-start/install.md,/docker-trusted-registry/install/
44+
/docker-trusted-registry/adminguide/docker-trusted-registry/install.md,/docker-trusted-registry/install/
45+
/v1.6/docker-hub/,/docker-hub/
46+
/v1.7/docker-hub/,/docker-hub/
47+
/v1.8/docker-hub/,/docker-hub/
48+
/v1.9/docker-hub/,/docker-hub/
49+
/v1.10/docker-hub/,/docker-hub/
50+
/v1.11/docker-hub/,/docker-hub/

‎_layouts/docs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@
191191
</div>
192192
<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 %} >
193193
<section class="section" id="DocumentationText">
194-
{{ content | markdownify }}
194+
{{ content }}
195195
{% if page.noratings != true %}
196196
<div style="text-align: center; margin-top: 50px">
197197
<img src="/images/chat.png" alt="chat icon" style="margin-right: 10px">
198198
<b>Feedback?</b> Questions? Suggestions?<br/>
199199
<a href="https://github.com/docker/docker.github.io/edit/master/{{ page.path }}" class="nomunge">Edit this page</a>,
200-
<a href="https://github.com/docker/docker.github.io/issues/new?title=Feedback for: {{ page.path }}&body=URL: {{ page.path }}" class="nomunge">file a ticket</a>, or rate this page:
200+
<a href="https://github.com/docker/docker.github.io/issues/new?title=Feedback for: {{ page.path }}&body=URL: [https://docs.docker.com/{{ page.path }}](https://docs.docker.com{{ page.url }})" class="nomunge">file a ticket</a>, or rate this page:
201201
<div id="pd_rating_holder_8453675"></div>
202202
<script type="text/javascript">
203203
PDRTJS_settings_8453675 = {

‎compose/compose-file.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ This will result in an image named `webapp` and tagged `tag`, built from `./dir`
7070
> **Note**: In the [version 1 file format](compose-file.md#version-1), `build` is different in
7171
> two ways:
7272
>
73-
> - Only the string form (`build: .`) is allowed - not the object form.
74-
> - Using `build` together with `image` is not allowed. Attempting to do so
73+
> 1. Only the string form (`build: .`) is allowed - not the object form.
74+
> 2. Using `build` together with `image` is not allowed. Attempting to do so
7575
> results in an error.
7676
7777
#### context
@@ -103,13 +103,15 @@ specified.
103103

104104
> **Note**: In the [version 1 file format](compose-file.md#version-1), `dockerfile` is
105105
> different in two ways:
106-
107-
* It appears alongside `build`, not as a sub-option:
108-
109-
build: .
110-
dockerfile: Dockerfile-alternate
111-
112-
* Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
106+
>
107+
> 1. It appears alongside `build`, not as a sub-option:
108+
>
109+
> ```
110+
> build: .
111+
> dockerfile: Dockerfile-alternate
112+
> ```
113+
>
114+
> 2. Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
113115
114116
#### args
115117

‎compose/gettingstarted.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,27 @@ If you want to run your services in the background, you can pass the `-d` flag
157157
(for "detached" mode) to `docker-compose up` and use `docker-compose ps` to
158158
see what is currently running:
159159

160-
$ docker-compose up -d
161-
Starting composetest_redis_1...
162-
Starting composetest_web_1...
163-
$ docker-compose ps
164-
Name Command State Ports
165-
-------------------------------------------------------------------
166-
composetest_redis_1 /usr/local/bin/run Up
167-
composetest_web_1 /bin/sh -c python app.py Up 5000->5000/tcp
160+
$ docker-compose up -d
161+
Starting composetest_redis_1...
162+
Starting composetest_web_1...
163+
$ docker-compose ps
164+
Name Command State Ports
165+
-------------------------------------------------------------------
166+
composetest_redis_1 /usr/local/bin/run Up
167+
composetest_web_1 /bin/sh -c python app.py Up 5000->5000/tcp
168168

169169
The `docker-compose run` command allows you to run one-off commands for your
170170
services. For example, to see what environment variables are available to the
171171
`web` service:
172172

173-
$ docker-compose run web env
173+
$ docker-compose run web env
174174

175175
See `docker-compose --help` to see other available commands. You can also install [command completion](completion.md) for the bash and zsh shell, which will also show you available commands.
176176

177177
If you started Compose with `docker-compose up -d`, you'll probably want to stop
178178
your services once you've finished with them:
179179

180-
$ docker-compose stop
180+
$ docker-compose stop
181181

182182
At this point, you have seen the basics of how Compose works.
183183

‎css/documentation.css

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,25 @@
1616
font-size: 16px;
1717
border-left: 4px solid #6db9d1;
1818
padding: 6px;
19-
background-color: #f5f5f5;
19+
background-color: #fafafa;
20+
color: black !important;
21+
}
22+
#DocumentationText blockquote li div.highlighter-rouge {
23+
padding-left: 20px;
24+
padding-right: 20px;
2025
}
2126
#DocumentationText blockquote p {
22-
color: black;
27+
color: black !important;
2328
margin: 0;
2429
padding: 10px 20px;
2530
}
2631
#DocumentationText blockquote p strong {
2732
color: #6db9d1;
2833
/* most Note's have a non-strong ':' display: block;*/
2934
}
35+
#DocumentationText blockquote ol, #DocumentationText blockquote ul {
36+
padding-left: 20px !important;
37+
}
3038
#DocumentationText code {
3139
border-width: 0px !important;
3240
background-color: #f5f5f5 !important;

‎engine/admin/formatting.md

+12
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,46 @@ This is the complete list of the available functions with examples:
3333
Join concatenates a list of strings to create a single string.
3434
It puts a separator between each element in the list.
3535

36+
{% raw %}
3637
$ docker ps --format '{{join .Names " or "}}'
38+
{% endraw %}
3739

3840
### Json
3941

4042
Json encodes an element as a json string.
4143

44+
{% raw %}
4245
$ docker inspect --format '{{json .Mounts}}' container
46+
{% endraw %}
4347

4448
### Lower
4549

4650
Lower turns a string into its lower case representation.
4751

52+
{% raw %}
4853
$ docker inspect --format "{{lower .Name}}" container
54+
{% endraw %}
4955

5056
### Split
5157

5258
Split slices a string into a list of strings separated by a separator.
5359

60+
{% raw %}
5461
# docker inspect --format '{{split (join .Names "/") "/"}}' container
62+
{% endraw %}
5563

5664
### Title
5765

5866
Title capitalizes a string.
5967

68+
{% raw %}
6069
$ docker inspect --format "{{title .Name}}" container
70+
{% endraw %}
6171

6272
### Upper
6373

6474
Upper turns a string into its upper case representation.
6575

76+
{% raw %}
6677
$ docker inspect --format "{{upper .Name}}" container
78+
{% endraw %}

‎engine/admin/logging/fluentd.md

+2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ The `docker logs` command is not available for this logging driver.
3333

3434
Some options are supported by specifying `--log-opt` as many times as needed:
3535

36+
{% raw %}
3637
- `fluentd-address`: specify `host:port` to connect `localhost:24224`
3738
- `tag`: specify tag for fluentd message, which interpret some markup, ex `{{.ID}}`, `{{.FullID}}` or `{{.Name}}` `docker.{{.ID}}`
39+
{% endraw %}
3840

3941

4042
Configure the default logging driver by passing the

‎engine/admin/logging/log_tags.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ docker run --log-driver=fluentd --log-opt fluentd-address=myhost.local:24224 --l
2323

2424
Docker supports some special template markup you can use when specifying a tag's value:
2525

26+
{% raw %}
2627
| Markup | Description |
2728
|--------------------|------------------------------------------------------|
2829
| `{{.ID}}` | The first 12 characters of the container id. |
@@ -34,30 +35,33 @@ Docker supports some special template markup you can use when specifying a tag's
3435
| `{{.DaemonName}}` | The name of the docker program (`docker`). |
3536

3637
For example, specifying a `--log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"` value yields `syslog` log lines like:
38+
{% endraw %}
3739

3840
```
3941
Aug 7 18:33:19 HOSTNAME docker/hello-world/foobar/5790672ab6a0[9103]: Hello from Docker.
4042
```
4143

44+
{% raw %}
4245
At startup time, the system sets the `container_name` field and `{{.Name}}` in
4346
the tags. If you use `docker rename` to rename a container, the new name is not
4447
reflected in the log messages. Instead, these messages continue to use the
4548
original container name.
49+
{% endraw %}
4650

4751
For advanced usage, the generated tag's use [go
4852
templates](http://golang.org/pkg/text/template/) and the container's [logging
4953
context](https://github.com/docker/docker/blob/master/daemon/logger/context.go).
5054

5155
As an example of what is possible with the syslog logger:
5256

53-
```
57+
```{% raw %}
5458
$ docker run -it --rm \
5559
--log-driver syslog \
5660
--log-opt tag="{{ (.ExtraAttributes nil).SOME_ENV_VAR }}" \
5761
--log-opt env=SOME_ENV_VAR \
5862
-e SOME_ENV_VAR=logtester.1234 \
5963
flyinprogrammer/logtester
60-
```
64+
{% endraw %}```
6165
6266
Results in logs like this:
6367

‎engine/admin/logging/overview.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ logging driver options.
243243

244244
For example, to specify both additional options:
245245

246-
```bash
246+
```bash{% raw %}
247247
$ docker run -dit \
248248
--log-driver=fluentd \
249249
--log-opt fluentd-address=localhost:24224 \
250250
--log-opt tag="docker.{{.Name}}" \
251251
alpine sh
252-
```
252+
{% endraw %}```
253253
254254
If container cannot connect to the Fluentd daemon on the specified address and
255255
`fluentd-async-connect` is not enabled, the container stops immediately.

0 commit comments

Comments
 (0)