dc13b9473f
Merge pull request #2686 from shykes/gofmt
...
gofmt
2013-11-13 11:35:37 -08:00
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
8e71391572
Merge pull request #2660 from SvenDowideit/2601-remote-api-json-case
...
update the API docs to reflect the change in the case of the /index/search reposnse
2013-11-13 11:17:54 -08:00
077c2496ed
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
2013-11-13 10:56:35 -08:00
b94e9ed0de
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-13 10:42:41 -08:00
c964494d31
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
2013-11-13 10:14:56 -08:00
c6e83b8779
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
2013-11-13 09:37:23 -08:00
369e39aea1
Merge pull request #2680 from inglesp/patch-1
...
Typo in ROADMAP.md
2013-11-13 09:19:37 -08:00
af0b2e38c3
add a little more info about the limitations of ADD wrt ../ and docker build -
2013-11-13 22:55:55 +10:00
87b4bb9fcc
Typo in ROADMAP.md
2013-11-13 12:32:49 +00:00
f0f8462d18
update the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying
2013-11-13 22:11:20 +10:00
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
3885ef585b
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
2013-11-12 15:04:26 -08:00
388057f11a
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
2013-11-12 14:40:17 -08:00
c69e6a90e4
Merge pull request #2663 from viirya/fix_nameserver_regex
...
Fix nameserver regex
2013-11-12 12:29:40 -08:00
71c05bb87c
Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running
...
on docker start, do not cleanup if already running
2013-11-12 11:02:10 -08:00
637850063c
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
2013-11-12 11:01:51 -08:00
dcc9980550
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-12 11:01:29 -08:00
e405337926
Merge pull request #2669 from tianon/clarify-test-calls
...
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 10:42:24 -08:00
5cdb3aec50
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 11:23:06 -07:00
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00
879aa29cb0
modify test of GetNameserversAsCIDR for its regex change.
2013-11-12 18:18:30 +08:00
1e5ba57de3
fix nameserver regex.
2013-11-12 10:53:34 +08:00
bc6d872841
on docker start, do not cleanup if already running
2013-11-11 18:15:38 -08:00
d589cc3622
Merge pull request #2527 from jpoimboe/fedora-iptables-fix
...
Fix container networking on Fedora
2013-11-11 15:12:40 -08:00
69a9614cb4
Merge pull request #2621 from rogaha/rm_del_all_example
...
- Added delete all the containers example (docker rm `docker ps -a -q`)
2013-11-11 14:55:50 -08:00
e2ac0e6b80
add wait, stop, start, restart, rm, rmi
2013-11-11 14:47:23 -08:00
01dd7e7459
Change crypto export notice to meet Debian requirements
2013-11-11 22:08:37 +00:00
84a3600ea8
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-11 13:54:17 -08:00
cb9e0aee48
Merge pull request #2646 from fgrehm/contrib-vagrant
...
Update contrib/vagrant-docker with projects available
2013-11-11 13:49:15 -08:00
52d3137713
Merge pull request #2641 from artagnon/master
...
CONTRIBUTING: wrap a couple of long lines
2013-11-11 13:43:30 -08:00
4c7d24bc8b
Merge branch 'master' of https://github.com/zilin/docker into zilin-master
...
Conflicts:
container.go
2013-11-11 12:59:18 -08:00
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
6fab249b21
Merge pull request #2313 from wazboy/master
...
Vagrant AWS update
2013-11-11 13:01:20 -08:00
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
ca113bb1b2
Merge pull request #2613 from tianon/ubuntu-fpm-tweaks
...
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-11 12:01:40 -08:00
9ff36cb00c
Merge pull request #2630 from jamtur01/api_status
...
Added status column to API client table
2013-11-11 11:56:04 -08:00
62f873aa1f
Just return the id; nothing else.
2013-11-11 13:26:24 -06:00
2091b59721
Merge pull request #2653 from tianon/sysvinit-upstart-check
...
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function
2013-11-11 11:00:07 -08:00
88edba7e86
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly)
2013-11-11 11:57:25 -07:00
5fe4c9a39a
Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic
...
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 10:39:51 -08:00
2fc0084f6b
Merge pull request #2633 from danderson/2598-fix-iptables-anydest
...
Correctly express "any address" to iptables.
2013-11-11 10:22:02 -08:00
7cf7dda87d
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-11 11:13:16 -07:00
bb76157d24
Fix sysvinit upstart detection and give it a pretty message
2013-11-11 11:10:19 -07:00
1d9139bb89
Merge pull request #2574 from crosbymichael/api-port-changes
...
Update documentation to reflect changes in Config and HostConfig
2013-11-11 09:59:48 -08:00
8149439d95
Make sure docker kill exit with failure in case of error
2013-11-11 09:15:51 -08:00
402a58a75a
Fix formatting in tests
2013-11-11 09:05:38 -08:00
9c7a8edddd
Update contrib/vagrant-docker with projects available
2013-11-11 13:36:44 -02:00
cf30b85eb1
CONTRIBUTING: wrap a couple of long lines
...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com >
2013-11-11 16:21:34 +05:30
ccbb5d3492
Vagrantfile updates.
...
- Remove the overrides config.vm.box and config.vm.box_url and use
the same values for all providers.
- Use the same private key path for all providers. It is still possible
to set a different private key path through the environment variable
SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
instance type of instead of hard coding the AWS instance type as
't1.micro'. 't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
API tools. This allows people who already have the EC2 tools set up
correctly to use 'vagrant up' with less environment configuration
than before.
- Rewrite the provisioning code. The goal is to be idempotent and to
correctly install docker for all providers instead of just virtualbox.
It will conditionally install the virtualbox guest additions if
virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
2013-11-10 23:39:26 -08:00
Guillaume J. Charmes