docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
20,092 Commits 92 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

20092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
5221fd2ba5 Merge pull request #12900 from gaurav-gosec/master 
Make use of iptablesPath variable which has the path of iptables, instea...
 2015-04-30 16:12:03 -07:00
Michael Crosby
6bb1986e7f Merge pull request #12914 from duglin/FixCPtext 
Don't wrap 'cp' help too soon.
 2015-04-30 16:05:20 -07:00
Tibor Vass
648bf6a446 Merge pull request #12909 from runcom/12907-fix-TestApiImagesDelete-net-none-build 
Fix TestApiImagesDelete for --net none build
 2015-04-30 18:22:04 -04:00
Mary Anthony
51977a2307 Adding support for GITHUB IGNORES to the engine Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-30 15:21:05 -07:00
Doug Davis
68ee5bdf96 Don't wrap 'cp' help too soon. 
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.

This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.

The \n made the output look funky.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-30 14:43:14 -07:00
John Howard
10e2dbf375 Windows: Factor out LXC 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:28:35 -07:00
John Howard
71bfb93678 Windows: Fork execdrivers.go for Windows execdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:22:30 -07:00
John Howard
b255c565ca Windows: Start refactor execdriver/driver.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:21:04 -07:00
John Howard
03eb0d065d Windows: Move workdir check daemon-side 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 14:16:45 -07:00
John Howard
f9c7772b83 Windows: Commit() rwTar defer close 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-30 12:17:33 -07:00
jhowardmsft
86d1223a29 Windows: mkdirall volume path aware 
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
 2015-04-30 11:59:42 -07:00
Antonio Murdaca
5c86f311c8 Fix TestApiImagesDelete for --net none build 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 20:49:28 +02:00
Alexander Morozov
72e9e12fa0 Merge pull request #12592 from Mic92/dockerfile 
Dockerfile: download go libraries before copy vendor
 2015-04-30 10:29:01 -07:00
moxiegirl
cacf90c963 Merge pull request #12857 from nikolas/patch-1 
Remove incorrect option in docker install command
 2015-04-30 09:35:20 -07:00
Tibor Vass
0d0b42547e Merge pull request #12771 from runcom/say-bye-to-engine 
Remove engine
 2015-04-30 12:18:16 -04:00
Brian Goff
fc9033a9c8 Merge pull request #12664 from Mashimiao/sysinfo-support-ipv4_forward-check 
sysinfo: add IPv4Forwarding check
 2015-04-30 11:44:44 -04:00
Brian Goff
1eb4e96f21 Merge pull request #12837 from mavenugo/integ 
A few more Integration tests to test Networking related daemon flags
 2015-04-30 11:12:43 -04:00
Lars Kellogg-Stedman
869ecba652 journald log driver: use CONTAINER_ID field for container id 
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-04-30 10:42:27 -04:00
Gaurav
1d5f1bb0f5 Make use of iptablesPath variable which has the path of iptables, instead of using string iptables directly 
Signed-off-by: Gaurav <gaurav.gosec@gmail.com>
 2015-04-30 18:22:12 +05:30
Vincent Demeester
424a544bb5 Fixing examples given for labels 
Fixes #12892

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-04-30 09:48:54 +02:00
Qiang Huang
987e221607 fix comments for test certain tests 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-30 15:40:48 +08:00
Daniel, Dao Quang Minh
cd2b019214 sort ports mapping before allocating 
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-30 02:18:04 +00:00
Antonio Murdaca
f7e417ea5e Remove integration tests and port them to integration-cli 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Antonio Murdaca
531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Sebastiaan van Stijn
029cbc1004 Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir 
docs: Add more places docker.service can be at
 2015-04-29 19:07:58 -04:00
Ahmet Alp Balkan
c0a1b2d6e9 docs: Add more places docker.service can be at 
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-29 22:39:48 +00:00
Phil Estes
2c4fe2aba3 Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term 
Add error check before getting term
 2015-04-29 17:57:01 -04:00
Aaron Davidson
c271c61fee Do our best not to invoke iptables concurrently if --wait is unsupported 
We encountered a situation where concurrent invocations of the docker daemon on a machine with an older version of iptables led to nondeterministic errors related to simultaenous invocations of iptables.

While this is best resolved by upgrading iptables itself, the particular situation would have been avoided if the docker daemon simply took care not to concurrently invoke iptables. Of course, external processes could also cause iptables to fail in this way, but invoking docker in parallel seems like a pretty common case.

Signed-off-by: Aaron Davidson <aaron@databricks.com>
 2015-04-29 14:40:25 -07:00
Dan Walsh
d0a4f310ef Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-29 15:06:47 -04:00
Madhu Venugopal
1c073ec176 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 11:41:13 -07:00
Jessie Frazelle
d716f22aad Merge pull request #12875 from runcom/remove-cfatal-in-goroutine-integration-cli 
c.Fatal won't fail and exit test inside a goroutine
 2015-04-29 10:47:17 -07:00
Alexander Morozov
6c46c9c839 Merge pull request #11526 from mizzy/append-drop-rule-not-insert 
Append DROP rule with --icc=false, not insert
 2015-04-29 10:28:11 -07:00
Madhu Venugopal
dd0666e64f Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 10:16:31 -07:00
Jessie Frazelle
53bef64804 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
 2015-04-29 10:00:41 -07:00
Madhu Venugopal
ba11929ebd Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:49 -07:00
Madhu Venugopal
0e254411b1 Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:42 -07:00
Madhu Venugopal
9c325c3f54 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:34 -07:00
Madhu Venugopal
f3f5ff9d83 Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:25 -07:00
Doug Davis
44f8c44e5f Merge pull request #12840 from vdemeester/11598-pkg-fileutils-tests 
Add coverage on pkg/fileutils
 2015-04-29 11:15:57 -04:00
Antonio Murdaca
4203230cbb c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-29 17:02:22 +02:00
Vincent Demeester
8454e1a3b2 Add coverage on pkg/fileutils 
Should fix #11598

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-04-29 16:27:12 +02:00
Doug Davis
534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Brian Goff
f2f8e4c5c9 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
 2015-04-29 09:14:03 -04:00
Lei Jitang
0e752adf55 Fix docker rename help not consistent with other commands 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-29 19:37:20 +08:00
Ma Shimiao
8a2f899286 use CustomSize replace intToString 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-29 08:30:25 +08:00
Brian Goff
d2f0b9ed97 Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers 
Expose the getResourcePath and getRootResourcePath wrappers.
 2015-04-28 18:45:36 -04:00
Jessie Frazelle
f80300e9cf Merge pull request #12789 from LK4D4/daemon_suite 
Implement daemon suite for integration-cli
 2015-04-28 15:30:36 -07:00
David Calavera
cfa3a080c6 Merge pull request #12820 from runcom/yet-another-sockRequest-refactor 
Expose whole Response struct in sockRequestRaw
 2015-04-28 13:26:30 -07:00
Jessie Frazelle
4676ff3fd7 Merge pull request #12245 from buddhamagnet/dockerignore-ignores 
Add support for exclusion rules in dockerignore
 2015-04-28 11:28:46 -07:00
buddhamagnet
6fd8e485c8 add support for exclusion rules in dockerignore 
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
 2015-04-28 18:56:45 +01:00