47f54ad882
abort on error and fix debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0098360726e3df99e8f76dce9221a85dd89c2065
Component: engine
2014-06-26 22:49:08 +00:00
7d486b32f4
add @tianon as maintainer of .dockerignore
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 42ca8a064b0e315c983997dbdb2560c40397eb0e
Component: engine
2014-06-26 22:49:08 +00:00
a23ad7fc08
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
2014-06-26 22:49:08 +00:00
d4f4419563
Change misnamed TarFilter to TarWithOptions
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
Upstream-commit: 111ab125b954c8d28503e1922e742eb271cc5d04
Component: engine
2014-06-26 22:49:08 +00:00
cae5fc8047
Remove api test for bind mount /
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: af025f2a95090974eaaf3d8792d5f467d0a637be
Component: engine
2014-06-26 15:39:45 -07:00
92fe778319
Merge pull request #6625 from vieux/remove_dockerscript
...
remove dockerscript
Upstream-commit: 69ec5824c3aec1dafb95264577807eac5afd9865
Component: engine
2014-06-26 14:56:22 -07:00
12c0cff814
add links to inspect for 'linking' containers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 55691e5fdc78b5c3015c7a481371e482878c14d2
Component: engine
2014-06-26 20:51:38 +00:00
1581226df4
Fixed manpage generation script and README
...
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: fa3ac2d37032583a7c1171c24d71fbf93e330acc
Component: engine
2014-06-26 15:51:26 -04:00
c8ce01c6ab
Merge pull request #6693 from tianon/bash-complete-force-rm
...
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
Upstream-commit: 363b49948ab565d1496d2d0832c06fc54be6eb8f
Component: engine
2014-06-26 15:06:02 -04:00
10316c12ae
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
2014-06-26 11:59:49 -07:00
cb56a2df49
Allow / as source of -v
...
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed. You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
2014-06-26 10:50:18 -07:00
c725e7ada4
Remove integration tests moved to integration-cli(dups)
...
integration/commands_test.go/TestRunHostname == integration-cli/docker_cli_run_tests.go/TestModeHostname
integration/commands_test.go/TestRunWorkdir == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestRunWorkdirExists == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestAttachstdIn == integration-cli/docker_cli_run_tests.go/TestRunStdinPipe
integration/commands_test.go/TestCmdLogs == integration-cli/docker_cli_logs_tests.go
integration/commands_test.go/TestCmdKill == integration-cli/docker_cli_kill_test.go
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 7606412d53b522774b2b7cea93fa2618b784e886
Component: engine
2014-06-26 12:57:12 -04:00
9c28be7542
devmapper: add thin-pool blocksize to the 'docker info' output
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: a2f3ce2294bbe998df24edd50f2b571d0b21bac8
Component: engine
2014-06-26 12:39:16 -04:00
fbe2366f74
devmapper: document the default DM thin pool blocksize
...
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: 79f217e3501a43326bd532e8eb03182f7488f61c
Component: engine
2014-06-26 12:06:41 -04:00
6b9f5d4f5c
Merge pull request #6690 from tianon/remove-apt-lists
...
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists
Upstream-commit: 9aa840c50dde3d61e620bc8d43861ed0101ac990
Component: engine
2014-06-26 08:13:12 -06:00
55be9bc370
refactor TruncIndex to use a trie & vendor deps
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e0dad305791a7406cf819a27fa5a079a46a62acc
Component: engine
2014-06-26 16:57:54 +03:00
befb61a0bc
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
2014-06-26 08:41:58 +01:00
ab438bdbda
Update examples/nodejs_web_app
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com > (github: leeplay)
Upstream-commit: 6bb6e422b5cd9e9ee97c5855a94b5776323a5626
Component: engine
2014-06-26 15:19:30 +09:00
8c910849c0
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 5e256799ddd6a297e22756363fc5eb079af0f07e
Component: engine
2014-06-25 22:12:25 -06:00
305a7d211a
Merge pull request #6684 from unclejack/fix_testparserunvolumes
...
fix TestParseRunVolumes with Go 1.3 randomization
Upstream-commit: 87c5ecdd690dbdb40df793d4635051ce7848986d
Component: engine
2014-06-25 18:54:25 -07:00
2e8c60ee30
Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists (trimming at least 40MB and forcing "apt-get update" in dependent images before packages can be installed)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c42b5575e5dff5b3a117462e32eda0095528e3b2
Component: engine
2014-06-25 19:07:39 -06:00
51f8aff176
Add the missing paren to the documentation for docker commit too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 389916bf9ae62ded0e497512da22faba75d0cf2d
Component: engine
2014-06-26 11:06:45 +10:00
c384cf54c2
Add missing parenthesis in docs for -author switch
...
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: misfo)
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com > (github: SvenDowideit)
Upstream-commit: 3fcb0d880aad65690cac304c30f72d0688a801d2
Component: engine
2014-06-26 11:06:45 +10:00
ac17422c22
Merge pull request #6668 from erikh/fix-links-userguide
...
Add ticks to docker links userguide, was not being rendered properly.
Upstream-commit: 917b7436aff96796de5b92653f62135017957790
Component: engine
2014-06-26 10:08:08 +10:00
e43dcd9e0a
Merge pull request #6635 from SvenDowideit/deputise-fredlf
...
Upstream-commit: fe31ea7d0fc0945afcef7116c8d3eed89e3ab3b9
Component: engine
2014-06-25 17:00:57 -07:00
9a4ed6541e
Merge pull request #6218 from vieux/update_maintainers
...
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
2014-06-25 17:00:32 -07:00
f113260ed3
Merge pull request #6626 from SvenDowideit/pr_out_updated_cloud_sdk_download_link_added_a_command_to_set_the_project
...
Updated Cloud SDK download link, added a command to set the project
Upstream-commit: 8eb34b2a0e73039b126c55c1c8f3328507041b80
Component: engine
2014-06-25 16:36:51 -07:00
acf65eee05
Merge pull request #6590 from robertbachmann/patch
...
Windows needs hardware virtualization
Upstream-commit: 6b6e915b858a9cf772e20ebb42cd67da4875157a
Component: engine
2014-06-25 16:36:30 -07:00
5c8857887a
Merge pull request #6136 from thatsamguy/add-mageia-mkimage
...
Add mkimage support for mageia using urpmi
Upstream-commit: 5ef0fe4b53e402928b44a6995e2f5957996a68a7
Component: engine
2014-06-25 17:33:39 -06:00
518e2ca12c
add Docker version and branch to html header
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5f6a7253321ffafdf84f53ea0253dd703b105c6b
Component: engine
2014-06-25 16:23:33 -07:00
03a05388ef
Merge pull request #6639 from leeplay/userguide
...
Update dockervolumes.md
Upstream-commit: d3fde633bdc675a7a4cac8d0519e4cd96b69a03a
Component: engine
2014-06-26 09:19:34 +10:00
c959443de4
Merge pull request #6185 from jbeda/debian-init-fix
...
Make debian init work when called repeatedly in quick succession
Upstream-commit: 02a0c7aca9b58be27dd52ecf24ddbaa5aebf91d5
Component: engine
2014-06-25 17:17:04 -06:00
f6a0457a3f
Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
...
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
2014-06-25 19:10:19 -04:00
128e5bda28
Merge pull request #6665 from leeplay/patch-1
...
Update dockervolumes.md
Upstream-commit: d15bc4a34234bd34d07f6e8c94a7ef9b24a55c1a
Component: engine
2014-06-26 08:57:14 +10:00
0e66ad87bd
fix TestParseRunVolumes with Go 1.3 randomization
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f6e6cf9071b098f3e38b42597d94cd0768b17219
Component: engine
2014-06-26 01:48:58 +03:00
2437455209
Merge pull request #6646 from tiborvass/fix-workdir
...
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
2014-06-25 15:19:51 -07:00
dbc649f34e
Merge pull request #6661 from tiborvass/tar_untar_file
...
Improve untar when using files instead of directories. Specifies behavior on non-existant targets.
Upstream-commit: 94370add0523352c94b4665d622b5dfe319b29ba
Component: engine
2014-06-26 00:37:42 +03:00
9b24606fc1
Merge pull request #6664 from LK4D4/bench_on_truncindex_delete
...
Add benchmarks on TrucnIndex.Delete
Upstream-commit: 17f653548260b7e1892dc5dd2153e508938af63f
Component: engine
2014-06-25 14:30:28 -07:00
02d80c84fb
Merge pull request #6669 from pwaller/issue-6652
...
Allow re-mounting an existing mount with "remount"
Upstream-commit: 7be83a0857dbf2f426949fee9aec4039ab16c59e
Component: engine
2014-06-25 14:18:25 -07:00
8897c337e6
Allow re-mounting an existing mount with "remount"
...
Without this line of code, if a volume is present in /proc/mounts,
it cannot be remounted with new mount options.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: f87afda12344b726c1bfb49b2dc8b5995f86f4ab
Component: engine
2014-06-25 22:06:24 +01:00
4526ee08e7
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
2014-06-25 13:39:47 -07:00
bc88f8248d
Add a step to verify if Docker is working as expected
...
Like in the other installation guides I added a simple test
to verify that importing images and starting containers is
working.
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: f3ea94a79775b30b7338a3fc99923978b260af28
Component: engine
2014-06-25 21:57:54 +02:00
8a88644313
Import public GPG key after adding the openSUSE repository
...
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: 0b2b3221e21c8c6947585481ad476d57653ade28
Component: engine
2014-06-25 21:53:45 +02:00
bc0ef19fac
Combined AddGet benchmark
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 04a9fe1e62345d282985724b9eb0cd7446c08449
Component: engine
2014-06-25 22:49:38 +04:00
2ab25c0f86
add integration test for --workdir=/
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
2014-06-25 11:02:59 -04:00
3325b6e290
fix bug in FollowSymlinkInScope when link == root
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
2014-06-25 11:02:59 -04:00
bb9a141a59
improve untar when using files instead of directories. Specifies behavior on non-existant targets.
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 1c8d3106df0bd2aba304c7b3863949ca11c2b133
Component: engine
2014-06-25 09:35:26 -04:00
a8f5e76a89
Update documentation noting that SIGCHLD is not proxied.
...
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: be4f4599a6d2a517e615dc1f64527a3f2ad2f683
Component: engine
2014-06-25 09:08:02 -04:00
053aa6d8a6
Add ticks to docker links userguide, was not being rendered properly, fix spelling error in /etc/hosts
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 6b2901954107c438d8e92dc6f595ec9bcd179777
Component: engine
2014-06-25 02:18:16 -07:00
64d580f03b
Update dockervolumes.md
...
~~~
kyu@kyu-HP-EliteBook-2570p:~/apps/docker/volume$ docker run -v /dbdata --name dbdata2 ubuntu
2014/06/25 14:17:44 Error response from daemon: No command specified
~~~
Upstream-commit: 9026888b109e6dd1042259ffd9e707d9e5f76d34
Component: engine
2014-06-25 14:53:59 +09:00
