Commit Graph

45 Commits

Author SHA1 Message Date
2e70c0f0f0 Add Entrypoint to builder and container config
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
0828523946 Check for local dns server and output a warning
Upstream-commit: a3f6054f974909458c9e820842310987e225b767
Component: engine
2013-06-06 11:01:09 -07:00
72a9843fea Add -dns to docker daemon
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
4747c5b99f linted names
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
ce120b932a Move docker build to client
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
2013-05-19 10:46:24 -07:00
f90a47c969 Merge pull request #618 from titanous/cleanup
Misc. cleanup
Upstream-commit: fef816163cf9713b7943025a8739717c971b269c
Component: engine
2013-05-15 18:05:31 -07:00
ee85b25e45 Fix logic flaw in builder.mergeConfig
Upstream-commit: 04748a77664c89340b789ef0a25d65b78477dce0
Component: engine
2013-05-15 15:51:04 -04:00
88a9363cae Split registry into subpackage
Upstream-commit: 9bb3dc9843f4ef565eb8f298eb7f542b5e1ac0dd
Component: engine
2013-05-15 01:41:39 +00:00
bc6fad489c Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
3980cc1280 Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
Upstream-commit: 6f3e868a7b8f239334d06b2385b776ce7ae5614f
Component: engine
2013-05-10 14:44:50 -07:00
8ba22c1167 Merge branch 'master' into remote-api
Upstream-commit: 32cbd72ebeedfd6be71cf840f8b56a19e2c0e64c
Component: engine
2013-05-07 21:02:32 +02:00
84ab689e05 propagate CpuShares in mergeConfig
Upstream-commit: eef8b0d406412ffe6622ed1f2c858540eb7f75f1
Component: engine
2013-05-07 11:44:38 -07:00
664f8fbbbd Check the command existance prior create and add Unit tests for the case
Upstream-commit: 42b1ea4889cd61790f81001ada5deac9354be378
Component: engine
2013-05-07 11:18:13 -07:00
44910e43b1 update to master
Upstream-commit: 10c0e990371e065d4fc1c9b680f03a46e5bacc5e
Component: engine
2013-05-07 19:23:50 +02:00
ec2fdcee5d Implement ENV within docker builder
Upstream-commit: e45aef0c82044be6a427502d4bbb0979074c2ba1
Component: engine
2013-05-06 18:39:56 -07:00
d00bfd7982 Rebase fix
Upstream-commit: 3439cd9cea8056cce62d46dd5cf59d6d5b50ef84
Component: engine
2013-05-06 17:07:56 -07:00
8112d65cfb Fix typo in builder
Upstream-commit: 979db00d9af4741572ece9c67061526d5d4a6616
Component: engine
2013-05-06 17:01:59 -07:00
1fa62362e8 Implement the CMD instruction in order to allow autorun
Upstream-commit: db4417b601feedb03cc70b79f64456e817ce0c05
Component: engine
2013-05-06 17:01:59 -07:00
6aedcc2420 Allow to stack multiple EXPOSE instructions
Upstream-commit: a64ebe5feb84d65adbc23ee9d2119f5eab836079
Component: engine
2013-05-06 17:01:59 -07:00
d43649a37e Moving runtime.Create to builder.Create
Upstream-commit: 602786cd60746cd2baf7bb14fb6acb60f9554f50
Component: engine
2013-05-06 17:00:51 -07:00
4d47ca713e Rebase fix
Upstream-commit: 35c59f4e05fb8dc3a5939d6af8c9313ebda6a5dd
Component: engine
2013-05-06 16:58:09 -07:00
7b44115892 Add compatibility with contrib builder
Upstream-commit: 756df27e45f2e5d9033058f60afa9547239af1d6
Component: engine
2013-05-06 16:44:37 -07:00
7230640e35 Implement caching for docker builder
Upstream-commit: a46fc3a59e585e005ec67b05211ca9de02f0c4ff
Component: engine
2013-05-06 16:44:37 -07:00
99d46ab38a Rebase master (autorun)
Upstream-commit: 9959e2cd637d09e8c37891cebcb1764c825ef7d5
Component: engine
2013-05-06 16:44:37 -07:00
8358eede2f Moving runtime.Create to builder.Create
Upstream-commit: f911ccc27bcbcf281a0d690c5d7b05709c8947d4
Component: engine
2013-05-06 16:44:37 -07:00
f2bd4a9977 Add build command
Upstream-commit: 96069de4e0818f9d513f6ea495e03d8e67eb1e98
Component: engine
2013-05-06 16:44:37 -07:00
3fba3bc835 Make the autopull compatible with new registry
Upstream-commit: 62a1850c16180ac83418e044e315ba8776f6a651
Component: engine
2013-05-06 16:40:45 -07:00
823b20b7ed Implement EXPOSE to builder
Upstream-commit: ae1e655fb1d95b5828a2b0cd67d19d090d04ff74
Component: engine
2013-05-06 16:01:01 -07:00
317d58fe0a Implement MAINTAINER to builder
Upstream-commit: 92e98c66af7543f9a9d6c1a223333201b39aa6dc
Component: engine
2013-05-06 16:01:01 -07:00
d86a77b5fe Make the FROM instruction pull the image if not existing
Upstream-commit: 924b61328cd63fc8b1da77d9cb4f1e6b85eb1592
Component: engine
2013-05-06 16:01:01 -07:00
9db7d3be72 Trim the splited builder lines
Upstream-commit: 4ebec08add53bd9b3e10c331168daa6579ebd6db
Component: engine
2013-05-06 16:01:01 -07:00
ba650a016c Rebase master (autorun)
Upstream-commit: 6c168a8986261c95ae5e036f008375f77afbe78e
Component: engine
2013-05-06 16:01:00 -07:00
0810d7206a Better varibale names
Upstream-commit: 4386edff0bc940543c61aa91d1f2144802ce1a08
Component: engine
2013-05-06 16:01:00 -07:00
12e1796fbe Change dockerbulder format, no more tabs and COPY becomes INSERT to avoid conflict with contrib script
Upstream-commit: 6bfb652f5b1bce989868f8269c3d736f3faf259a
Component: engine
2013-05-06 16:01:00 -07:00
fe276c128a Fix image pipe with Builder COPY
Upstream-commit: 4390a3182f9ea4fc1e215917c2c6494d6fc453ac
Component: engine
2013-05-06 16:00:30 -07:00
f04a7eaf7c Make Builder.Build return the builded image
Upstream-commit: dade95844feaa2446e472767e1e2763996241dee
Component: engine
2013-05-06 16:00:30 -07:00
6338e1a746 use new image as base of next command
Upstream-commit: 74b9e851f6f407ede9d46ab4960e5e134ff666c7
Component: engine
2013-05-06 16:00:30 -07:00
0c47ce6243 Move runtime.Commit to builder.Commit
Upstream-commit: f7c5e92a2e1ec30f50b0affe952a0496c62195f5
Component: engine
2013-05-06 16:00:30 -07:00
830fa88486 Moving runtime.Create to builder.Create
Upstream-commit: 6f2125386a07a01eccce3bb4602aeecb8be3458b
Component: engine
2013-05-06 16:00:30 -07:00
a99d883419 Implement the COPY operator within the builder
Upstream-commit: 0aebb254106be3086838cac145404c5d21c6bcd0
Component: engine
2013-05-06 16:00:30 -07:00
5993a0f74b Make sure the destination directory exists when using docker insert
Upstream-commit: 9db4972a70c2fb0921f984d67f816b81ea687a11
Component: engine
2013-05-06 16:00:30 -07:00
ab1d9f289b Add a Builder.Commit method
Upstream-commit: 7bccdc0d33d0589792b9b867b13c9e50dcf48358
Component: engine
2013-05-06 16:00:30 -07:00
c9f1300141 make builder.Run public it now runs only given arguments without sh -c
Upstream-commit: 97215ca384373bfa65c08dc05454c14cef493d30
Component: engine
2013-05-06 16:00:30 -07:00
8c56001b2a Clear the containers/images upon failure
Upstream-commit: b8f66c0d14780bd8cb3b8916acc0287fcaf8cafa
Component: engine
2013-05-06 16:00:30 -07:00
f973956288 Add build command
Upstream-commit: 27319da0d260b42acdbc3fd2a639ad3986d1ba64
Component: engine
2013-05-06 16:00:30 -07:00