Jessica Frazelle
132122a454
update maintainers file for parsing
...
update standard for dockerfiles so we can clean up dockers and parse
into one repo
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-03 14:01:40 -08:00
David Lawrence
064e37560e
adding tests for role based key support on server
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 13:58:25 -08:00
Tonis Tiigi
53cd579b6e
vendor: bump distribution to 568bf038af
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-12-03 13:36:31 -08:00
David Calavera
29c69ce2a9
Merge pull request #18374 from calavera/volume_inspect_exit
...
Return error code when `volume inspect` fails with a template.
2015-12-03 13:31:47 -08:00
Phil Estes
4d849619d4
Merge pull request #17481 from vdemeester/17446-network-inspect-format
...
Add format flag to network inspect
2015-12-03 16:16:04 -05:00
Tonis Tiigi
eff5e6498f
Disable timeout for systemd
...
With content addressability update starting upgraded
daemon for the first time can take a long time if
graph dir was not prepared with a migration tool before.
This avoids systemd timeouts while the migration is
taking place.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-12-03 13:15:31 -08:00
John Howard
2097e7fcee
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-12-03 12:45:56 -08:00
Jess Frazelle
94d5459a0c
Merge pull request #18397 from Microsoft/jjh/fix-windows-ci
...
Fix broken Windows CI
2015-12-03 12:41:19 -08:00
Stephen Day
568bf038af
Merge pull request #1233 from kendru/patch-1
...
Escape dollar signs
2015-12-03 12:29:12 -08:00
Stephen Day
4cf93714f3
Merge pull request #1231 from tonistiigi/digest-length-check
...
Validate digest length on parsing
2015-12-03 12:17:16 -08:00
Jessica Frazelle
b97110dda7
cleanup people in maintainers file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-03 12:14:37 -08:00
Stephen Day
d46b6a8796
Merge pull request #1211 from tt/remove-name-verification
...
Remove name verification
2015-12-03 11:59:21 -08:00
David Lawrence
c0a84c2508
update notarymysql/migrate.go to add role to timestamp_keys and update indexes
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 11:48:18 -08:00
Daniel Hiltgen
8dce8e9901
Add token pass-thru for AuthConfig
...
This change allows API clients to retrieve an authentication token from
a registry, and then pass that token directly to the API.
Example usage:
REPO_USER=dhiltgen
read -s PASSWORD
REPO=privateorg/repo
AUTH_URL=https://auth.docker.io/token
TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
jq -r ".token")
HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
curl -s -D - -H "X-Registry-Auth: ${HEADER}" -X POST "http://localhost:2376/images/create?fromImage=${REPO} "
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
2015-12-03 11:40:27 -08:00
David Lawrence
2dc2fe6738
set initial role value for existing records in timestamp_keys table
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 11:25:45 -08:00
David Lawrence
e20773f2b1
renaming TimestampKey and ErrTimestampKeyExists to just Key and ErrKeyExists
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 11:25:45 -08:00
David Lawrence
76caa3d76a
adding migrations for new timestamp_keys role column including key changes
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 11:25:45 -08:00
David Lawrence
c2c474b9c6
generalize notary server key storage to be able to handle any role, not just timestamps
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 11:25:45 -08:00
Daniel Nephin
7240ff35ee
Bump 1.5.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-03 11:18:32 -08:00
Tibor Vass
5bb4d0d9ea
Move DisconnectFromNetwork back to daemon/
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-12-03 20:10:27 +01:00
Sebastiaan van Stijn
2f9b541b89
Merge pull request #18394 from thaJeztah/carry-17869-add-volume-driver
...
[Carry 17869] Add docs and man page entry for --volume-driver
2015-12-03 20:06:18 +01:00
David Lawrence
9b4f7ca599
Merge pull request #323 from endophage/mysql_parsetime
...
when using a mysql database, need to set parseTime=True in connection…
2015-12-03 11:05:27 -08:00
Daniel Nephin
aaf66e3485
FAQ document for Compose
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-03 11:05:06 -08:00
Aanand Prasad
96f4a42a35
Validate the 'expose' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-12-03 11:05:05 -08:00
Aanand Prasad
e6fbca42a1
Split out ports validation tests into type, uniqueness, format
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-12-03 11:05:05 -08:00
Aanand Prasad
527bf3b023
Fix ports validation message
...
- The `raises` kwarg to the `cls_check` decorator was being used
incorrectly (it should be an exception class, not an object).
- We need to check for `error.cause` and get the message out of the
exception object.
NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-12-03 11:05:05 -08:00
Aanand Prasad
ab36c9c6cd
Refactor ports section of fields schema
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-12-03 11:05:05 -08:00
Aanand Prasad
e67419065a
Fix ports validation test
...
We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-12-03 11:05:05 -08:00
Daniel Nephin
69e956ce8b
Add integration test and docs for build with a git url.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-03 11:05:05 -08:00
Jonas Eckerström
0dbd99bad2
Added support for url buid paths
...
Signed-off-by: Jonas Eckerström <jonaseck@gmail.com >
2015-12-03 11:05:05 -08:00
Daniel Nephin
fa975d7fbe
Properly resolve environment from all sources.
...
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-03 11:05:01 -08:00
David Lawrence
77d72ba81c
when using a mysql database, need to set parseTime=True in connection string query params
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-12-03 10:39:13 -08:00
David Calavera
867f432985
Move docker system information to a dedicated router and backend.
...
Because I like the name `system` better than `local` :)
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-03 13:38:56 -05:00
Dong Chen
9df95842a9
Godep update github.com/samalba/dockerclient.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2015-12-03 10:28:48 -08:00
David Calavera
b9d30280f6
Return error code when volume inspect fails with a template.
...
Following `docker inspect` conventions:
- Keep partial info in a buffer to not print incomplete template outputs.
- Break execution when template parsing or decoding fail.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-03 13:22:55 -05:00
Thomas Recloux
bd12140d6b
Google : update default image to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 19:14:14 +01:00
Thomas Recloux
697b543789
Rackspace : update default image to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 19:14:14 +01:00
Thomas Recloux
ca7ea324c4
Exoscale : update default image to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 19:14:14 +01:00
Thomas Recloux
73ddbe02ac
DigitalOcean : update default image to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 19:14:14 +01:00
Thomas Recloux
977fa7e48f
Azure : update default image to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 19:14:08 +01:00
John Howard
c10311bc9a
Fix broken Windows CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-12-03 10:12:11 -08:00
moxiegirl
cf011bc1cb
Merge pull request #34 from thaJeztah/lyndaoleary-16156-find-an-issue-labels
...
[carry] update "find an issue" with new labels
2015-12-03 09:49:17 -08:00
Sebastiaan van Stijn
785d26288b
Updated find an issue with new labels
...
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-03 18:18:34 +01:00
Richard Scothern
eef3382222
Merge pull request #1232 from pdevine/catalog-clarification
...
Clarify pagination for catalog API endpoint
2015-12-03 09:14:23 -08:00
Jean-Laurent de Morlhon
b8b5bd8a45
Merge pull request #2442 from dgageot/version
...
Add version to machine ls
2015-12-03 17:55:58 +01:00
Alexander Morozov
4b55765c11
Use /docker as cgroup parent instead of docker
...
It means that containers will be created under root cgroup and not under
daemon cgroup.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-12-03 08:42:45 -08:00
Phil Estes
d9755df2b3
Merge pull request #18391 from runcom/remove-daemon-config-func
...
daemon: remove private func config()
2015-12-03 11:42:31 -05:00
David Calavera
6bb0d1816a
Move Container to its own package.
...
So other packages don't need to import the daemon package when they
want to use this struct.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-12-03 17:39:49 +01:00
Tibor Vass
33ab2bb52c
Merge pull request #18266 from calavera/events_pub_sub
...
Event PubSub topics + linear filtering.
2015-12-03 17:11:40 +01:00
David Gageot
3612c55677
Add version to machine ls
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-03 16:27:42 +01:00