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
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jess Frazelle
b69243e951 Merge pull request #19169 from Djelibeybi/fix-ol6-build 
Restoring the RPM build process for Oracle Linux 6
 2016-01-15 16:56:11 -08:00
Daniel Nephin
ab927b986f Test against 1.10rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 19:04:01 -05:00
Sebastiaan van Stijn
e281f640c6 Switch Windows Dockerfile to golang 1.5.3 
Also renamed the env-variable to match what
we use in other locations (for easier finding)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-15 15:52:53 -08:00
Jess Frazelle
4e9ee2a239 Merge pull request #19373 from Microsoft/jjh/makefile 
Windows: Update makefile
 2016-01-15 15:42:47 -08:00
Jess Frazelle
b70d615222 Merge pull request #18348 from hypriot/add-dockerfile-for-windows 
Add initial support building Windows docker in docker
 2016-01-15 15:42:11 -08:00
Jessica Frazelle
3466e5c911 fix selinux version for contrib/builder generation 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-15 15:29:43 -08:00
Daniel Nephin
34fd042dbf Increase the timeout for all acceptance tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 18:12:57 -05:00
Daniel Nephin
89e31f7a8d Validate that an extended config file has the same version as the base. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 18:12:56 -05:00
Daniel Nephin
cce3b29688 Merge pull request #2665 from dnephin/check_extends_use_same_version 
Validate that an extended config file has the same version as the base
 2016-01-15 18:07:56 -05:00
David Calavera
15e5cd14d6 Merge pull request #19255 from hqhq/hq_build_args_makefile 
Add DOCKER_BUILD_ARGS support for make build
 2016-01-15 14:21:37 -08:00
Alexander Morozov
790e648c06 Merge pull request #19340 from Microsoft/jjh/rsrcfix 
Windows: Remove linkmode internal hack
 2016-01-15 14:10:56 -08:00
Daniel Nephin
b446c09735 Merge remote-tracking branch 'docker/release' into bump-1.6.0-rc1 2016-01-15 17:02:06 -05:00
Vincent Demeester
c476b2e3b5 Merge pull request #19041 from Akasurde/11556 
Updated documentation related to apt-cacher-ng
 2016-01-15 22:44:46 +01:00
David Lawrence
c44de7e37a Merge pull request #415 from endophage/cleaning_certs_code 
some cleanup of certs code
 2016-01-15 13:40:11 -08:00
Alexander Morozov
402ba93f68 Merge pull request #19374 from Microsoft/jjh/termdeadcode 
Windows: Remove dead/unused code
 2016-01-15 13:30:23 -08:00
Fabio Rapposelli
00040796e2 Fix shared folder mount on restart 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2016-01-15 22:29:43 +01:00
Nathan LeClaire
0bbf6f126d Merge pull request #2789 from robvanmieghem/master 
FIX #2411 On a btrfs system, don't default to aufs
 2016-01-15 13:20:26 -08:00
Phil Estes
dd104eb91d Merge pull request #19345 from tianon/fast-syscall-compile 
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
 2016-01-15 16:06:14 -05:00
Jean-Laurent de Morlhon
9ed16a0e4e Merge pull request #2847 from jeffellin/UseExistingKeypair 
Fixes #1898. Add parameter to pass private key path to use when creat…
 2016-01-15 21:49:18 +01:00
John Howard
76ebd3dd17 Windows: Remove dead code 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-15 12:48:40 -08:00
Daniel Nephin
9e805731e7 Merge pull request #2671 from dnephin/fix_linux_master_build 
Fix linux master build
 2016-01-15 15:23:24 -05:00
Phil Estes
bc13e4a99e Merge pull request #19369 from cpuguy83/19362_fix_exec_panic 
Fix panic on starting exec more than once
 2016-01-15 15:17:52 -05:00
Rob Van Mieghem
84ff3e3549 Improve provisiontest.FakeSSHCommander 
Signed-off-by: Rob Van Mieghem <rob@vanmieghemcloud.com>
 2016-01-15 21:13:29 +01:00
Jeffrey Ellin
c3131ec3fa Fixes #1898. Add parameter to pass private key path to use when creating a machine. 
It is assumed that the corresponding public certificate will be the same file name + .pub

Signed-off-by: Jeffrey Ellin <jeff@ellin.com>
 2016-01-15 15:10:03 -05:00
Daniel Nephin
82b288b25b Fix linux master build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 15:02:19 -05:00
John Howard
08fe0a18f8 Windows: Update makefile 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-15 11:45:13 -08:00
David Lawrence
c0fb05584e fixing incorrect comments 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-15 11:30:32 -08:00
David Lawrence
9e80ad8158 remove certs.NewManager function 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-15 11:30:32 -08:00
David Lawrence
a8b21cafe0 CertManager is completely removed 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-15 11:30:32 -08:00
David Lawrence
78fb3eef7f trustedCAStore isn't being used anywhere, deleted it 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-15 11:30:32 -08:00
David Lawrence
48ecd8d2cb some cleanup of certs code 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-01-15 11:30:32 -08:00
David Calavera
b63b43dc4c Merge pull request #19219 from runcom/add-log 
integration-cli: log error when starting registry
 2016-01-15 09:44:47 -08:00
Daniel Nephin
61a49bb6ba Remove the use of dockerversion from the registry package 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 12:43:54 -05:00
Brian Goff
1a60a805bf Fix panic on starting exec more than once 
Issue was caused when exec is tarted, exits, then stated again.
In this case, `Close` is called twice, which closes a channel twice.

Changes execConfig.ExitCode to a pointer so we can test if the it has
been set or not.
This allows us to return early when the exec has already been run.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-15 11:57:23 -05:00
Tibor Vass
012a3b6e74 Merge pull request #19365 from tiborvass/bump_apiversion_to_v1.23 
Bump API Version to v1.23
 2016-01-15 10:48:15 -05:00
David Gageot
53c5b1f481 Merge pull request #2845 from jeanlaurent/aws-unit-test-are-unit-again 
Fix 2829 : aws unit test are unit again
 2016-01-15 16:47:29 +01:00
David Gageot
dd5dd5d178 Merge pull request #2790 from daehyeok/vmwarefusion_dhcp 
VMWARE Fusion get IP from multiple leases files
 2016-01-15 16:46:54 +01:00
Tibor Vass
a0fab35fe8 Bump API Version to v1.23 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-15 10:44:02 -05:00
Daniel Nephin
0f1a798f28 Increase the timeout for all acceptance tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 10:14:55 -05:00
Qiang Huang
66d24c2b44 Add support for build and test docker on arm64 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-01-15 14:25:03 +00:00
Jean-Laurent de Morlhon
37c174d25a Add missing test on SecurityGroupPermission 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-15 15:03:58 +01:00
Jean-Laurent de Morlhon
6023e13169 Fix 2829 : aws unit test are unit again 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-15 15:01:28 +01:00
Jean-Laurent de Morlhon
438f91c6ba Merge pull request #2839 from jeanlaurent/aws-credentials 
Use ~/.aws/credentials file to login to ec2
 2016-01-15 13:01:05 +01:00
Vincent Demeester
9b63019711 Merge pull request #19234 from jdoliner/patch-1 
Remove Pachyderm storage driver.
 2016-01-15 12:48:42 +01:00
Arthur Baars
19d7c9e051 StorageDriver GCS: try google.DefaultTokenSource first 
Signed-off-by: Arthur Baars <arthur@semmle.com>
 2016-01-15 11:47:47 +00:00
Jean-Laurent de Morlhon
bc07ba3006 Sample Integration Test 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-15 12:04:19 +01:00
Jean-Laurent de Morlhon
89f3308088 Use ~/.aws/credentials file when no access/secret is given in cli 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-15 12:04:18 +01:00
Jean-Laurent de Morlhon
8094d6ce52 Merge pull request #2844 from zchee/fix-provision-systemd 
Fix docker daemon flag on systemd
 2016-01-15 11:10:27 +01:00
Jean-Laurent de Morlhon
599a84b469 Allow stubbing AWS Login 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-15 11:06:30 +01:00
Joe Doliner
5063efb8d8 Remove Pachyderm storage driver. 
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
 2016-01-15 02:06:20 -08:00