56ea157723
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
2015-05-14 17:31:45 -07:00
2e9a18b752
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
2015-05-14 18:58:55 +08:00
71c213ec0b
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
Upstream-commit: 3985f1781228d6060228d83e559f14e6d7cc9d7c
Component: engine
2015-05-12 18:04:33 -07:00
aeecef0f70
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
2015-05-13 00:09:41 +02:00
aaf186c8e8
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: aed8f9f76e16ed7acc49fbdef5f4563834ac5167
Component: engine
2015-05-12 14:26:57 -07:00
4a0ddadbc0
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
2015-05-12 20:09:49 +02:00
a9af2bce60
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
d482451b94
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
Upstream-commit: f6fa579d52a446d6a8171330ddad73602c79dd30
Component: engine
2015-05-07 17:02:58 -07:00
5a7855d50e
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
Upstream-commit: d34abea15b1e82c6c1b8a3dc8ab23097a6dae953
Component: engine
2015-05-07 16:50:20 -07:00
a555add607
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
Upstream-commit: 237bd23af85dc2624e973534bca1caa8741ab8f6
Component: engine
2015-05-07 16:16:52 -07:00
4d8c51b323
Don't fsync on V2 registry push tempfile creation
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: ec66daebc2087b9bab832c973f1bd7f8a6d1a5f4
Component: engine
2015-05-07 14:49:38 -04:00
61b5e9a5f1
Merge pull request #12977 from Microsoft/10662-graphloadfilepath
...
Windows: Filepath in graph\load.go
Upstream-commit: 7d38d33f018a96bde5d08ae09628d4444b0aee26
Component: engine
2015-05-06 15:01:49 -07:00
a78ec5ccea
Merge pull request #12975 from Microsoft/10662-graphexportfilepath
...
Windows: graph\export.go filepath fixes
Upstream-commit: a242ceaa0967a72dee55ef6a2cec05c78526d33c
Component: engine
2015-05-05 21:44:57 -04:00
d33c276cc3
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3b2c8f69fd7f1ca6a463b9bd2c2e006d9e13fe98
Component: engine
2015-05-04 16:18:23 -07:00
1195e97bff
Windows: Filepath in graph\load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bb1ecde1648220871bbf627b8a844fc8501163ba
Component: engine
2015-05-04 15:14:39 -07:00
2a741d7980
Windows: First fix for graph\graph.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b30f14f06d3a6c289257cf29d2e967ba09900a1e
Component: engine
2015-05-04 15:06:51 -07:00
e1e136fe26
Windows: graph\export.go filepath fixes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 377ed712d38e75d24ebfe2b5b91455a77bf8b086
Component: engine
2015-05-04 14:56:23 -07:00
7bd38d02c2
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 576985a1dcd76a9af2c5c483e6f12035a1f47b96
Component: engine
2015-05-01 16:01:10 -06:00
954f940156
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
2015-04-27 21:50:33 +02:00
7cb48fca64
Merge pull request #12532 from ankushagarwal/eliminate-json-marshal
...
Eliminate json.Marshal from graph/export.go and volumes/volume.go
Upstream-commit: 531ec3cac92d482ac0d45b0aea6727945f257507
Component: engine
2015-04-27 13:54:20 -05:00
e5f7f8da6f
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
2015-04-26 15:02:01 +02:00
0909a59dd0
Eliminate json.Marshal from graph/export.go and volumes/volume.go
...
Fixes #12531
Fixes #12530
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 29a3bbf2b375111b9494df1ce5ee457508f7acad
Component: engine
2015-04-24 15:40:21 -07:00
41061500b4
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
2015-04-23 23:36:29 +02:00
88eea81abe
Merge pull request #12655 from jlhawn/fix_12281
...
Validate repo name before image pull
Upstream-commit: 68fc79f5924bc76111422eec5b7713a586febd96
Component: engine
2015-04-23 13:12:12 -07:00
fdbedc1a2a
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
Upstream-commit: 9ed5bfb083a8e848b43f5220ca89c82ea416a93b
Component: engine
2015-04-23 11:50:31 -07:00
8cb2465efc
Validate repo name before image pull
...
Checks for reserved 'scratch' image name.
fixes #12281
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 18f46883851e47387ec2bd116940cdae97ba3c8d
Component: engine
2015-04-23 11:44:46 -07:00
bda3c79940
remove job from image_export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2a14b7dd35901167d83735a25ff626596391c4ed
Component: engine
2015-04-23 10:54:25 -07:00
c8f1332dce
Move CLI config processing out from under registry dir
...
No logic changes should be in here, just moving things around.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
2015-04-23 10:18:38 -07:00
6b55be9005
remove job from push
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: d456401fe1d038ddaf9866bb6ab4ac5744186e2d
Component: engine
2015-04-23 21:21:56 +08:00
ece94d0722
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
2015-04-23 19:13:12 +08:00
1b7f0b8878
Merge pull request #12611 from LK4D4/remove_eng_chain_pull
...
Remove chain of engine passing from builder to loadManifest
Upstream-commit: ccbb93e1cd38ad0a38455ad054b170f444aa9da3
Component: engine
2015-04-21 19:19:56 -04:00
43e79cc411
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
2015-04-21 14:55:23 -07:00
79e92cb2ff
Merge pull request #12567 from brahmaroutu/integration_test6_12255
...
moving integration tests to graph unit tests
Upstream-commit: 7ba8c3b26ffedc869c2868c3e90ef81315af6b8f
Component: engine
2015-04-21 13:58:02 -07:00
b383a47d39
Merge pull request #12600 from LK4D4/remove_image_set
...
Remove image_set engine job
Upstream-commit: 725ea8c09ef974d85f562919b6610354069e0cde
Component: engine
2015-04-21 16:51:46 -04:00
b6c443e015
Merge pull request #12564 from LK4D4/remove_jobs_trust
...
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
2015-04-21 16:49:01 -04:00
95350b9286
Remove image_set engine job
...
It was unused
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 79a7fedcd8f9aaa42ec4e7f0fdd1f915c27e850b
Component: engine
2015-04-21 13:04:28 -07:00
c53bd31df2
Remove job image_get
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d07fe1836579b0d55813cae8736be31a2891501a
Component: engine
2015-04-21 21:01:09 +02:00
16933141bf
Remove job image_tarlayer
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ba0017595ed9ac30273832b93365b0cb1cf60c05
Component: engine
2015-04-21 19:59:45 +02:00
b10206f2eb
moving integration tests to graph unit tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 29c5596176769fc99a22b1d0a78dd5ea279fec69
Component: engine
2015-04-20 21:08:45 +00:00
16569396d9
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
2015-04-20 13:37:06 -07:00
0790d1610c
Remove engine from trust
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9e50bf6270f426f6ef6649b1985036988b207407
Component: engine
2015-04-20 12:48:33 -07:00
14bae8f05b
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
2015-04-19 16:02:28 -04:00
dd5f4141fe
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
2015-04-19 18:36:56 +08:00
41c63ff3d3
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
2015-04-17 15:26:30 -04:00
0ff275f7b4
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
2015-04-17 09:55:02 -07:00
234898b4e7
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
2015-04-15 10:22:07 -07:00
a4111cba55
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
2015-04-14 01:37:36 +02:00
0a6b6476fe
Add event log for push
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: f5a07f0c884fc6d4fa7882cd8d07319c9bcfba1c
Component: engine
2015-04-13 09:41:15 +08:00
f10bd173bd
Merge pull request #11478 from dmcgowan/v2-vendored-api
...
Use v2 api from distribution
Upstream-commit: 563041b5c4acaca8e6ebb8fb4e81a3e7e7c37e81
Component: engine
2015-04-10 17:22:38 -04:00
3f75ea937e
Only use fallback to short IDs when obvious.
...
As reported in #11294 , the Docker daemon will execute contains it
shouldn't run in the event that a requested tag is present in an image's
ID. This leads to the wrong image being started up silently.
This change reduces the risk of such a collision by using the short ID
iff the actual revOrTag looks like a short ID (not that it necessarily
is).
Signed-off-by: Richard Burnison <rburnison@ebay.com >
Upstream-commit: 8d1a500303a9dd892301e343c94821207c715fbb
Component: engine
2015-04-10 13:20:44 -04:00
