0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
34759 commits 14 branches 412 tags 338 MiB
Commit graph

140 commits

Author SHA1 Message Date
Daniel Nephin
bb429da9a9 Hide builder.parser.Directive internals 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-12 14:48:09 -04:00
Daniel Nephin
bfcd95817a Factor out functions from builder/dockerfile/builder.go:Builder.build() 
Remove the block comment which is stale, and redundant now that the
function is just as readable as the comment.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-11 14:44:32 -04:00
Daniel Nephin
c7fad9b750 Cleanup in dispatcher.env 
Remove commented code blocks
Remove some duplication in comparing and restructuring env

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-11 14:44:28 -04:00
Daniel Nephin
f3e205ddc1 Remove the dockerfile field from Builder. 
Return dockerfile from parseDockerfile and pass the dockerfile nodes
as an arg

Strip unused arg from builder.NewBuilder.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-10 18:09:17 -04:00
Daniel Nephin
4d9e32a08e Merge pull request #31352 from dnephin/allow-arg-in-fromt 
[dockerfile] Allow ARG in FROM
 2017-04-10 13:23:40 -04:00
Daniel Nephin
239c53bf83 Refactor BuildArgs 
Add MetaArgs for ARG that occur before the first FROM
Integration test for these cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-07 17:57:47 -04:00
Daniel Nephin
f0a9c2e3f4 Allow ARG to come before FROM to support variables in FROM. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-07 17:57:47 -04:00
Simon Ferquel
b0e7588873 Test and fix forbidden path for COPY --from on Windows 
Paths resolving to c:\ or c:\windows are forbidden

Replaced the obscure (and non-working) regex with a simple case
insensitive comparison to the black listed paths (we should forbid c:\,
c:\windows but not d:\)

Also, add a test ensuring paths are case insensitive on windows

Also, made sure existing multi-staged build tests pass on windows

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-04-07 18:00:36 +02:00
Tonis Tiigi
672ea30a94 Add support for FROM using named block 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
73b4b8ed7f Implicit copy-from with reference 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
f95f58283b Add support for COPY from previous rootfs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-23 15:12:15 -07:00
Tonis Tiigi
09f308ce21 Fix ARG scoping for Dockerfiles with multiple FROM 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-20 11:24:44 -07:00
Tony Abboud
7a962e4577 Add --add-host for docker build 
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
 2017-02-20 17:32:28 -05:00
Tonis Tiigi
0f293f9eb3 Reset stdin config before running build actions 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-02-15 11:49:17 -08:00
Daniel Nephin
80b642ff88 Ignore the daemon log config when building images. 
Logs created by build containers should be handled by the daemon, not by logging drivers.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-30 10:59:19 -05:00
Daehyeok Mun
6306019d0b Refactoring ineffectual assignments 
This patch fixed below 4 types of code line
1. Remove unnecessary variable assignment
2. Use variables declaration instead of explicit initial zero value
3. Change variable name to underbar when variable not used
4. Add erro check and return for ignored error

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2017-01-13 00:27:01 -07:00
Sebastiaan van Stijn
d6be0e9802 Merge pull request #28631 from likel/master 
Don't do format if it's unnecessary
 2016-12-30 01:13:12 +01:00
allencloud
6fb05778ba fix nits in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-27 23:30:50 +08:00
Ke Li
514adcf458 Remove redundant format 
Signed-off-by: Ke Li <kel@splunk.com>

Add missing changes

Signed-off-by: Ke Li <kel@splunk.com>

User errors.New to create error

Signed-off-by: Ke Li <kel@splunk.com>
 2016-12-27 21:46:52 +08:00
Vincent Demeester
ef39256dfb
Remove hostname validation as it seems to break users 
Validation is still done by swarmkit on the service side.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-30 19:22:07 +01:00
Qiang Huang
e6866492c4 Fix bunch of typos 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-10-29 15:03:26 +08:00
boucher
bd7d51292c Allow providing a custom storage directory for docker checkpoints 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-10-28 07:56:05 -04:00
sandyskies
60813af7ae add --network option for docker build 
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-25 10:25:36 -07:00
Tibor Vass
f5f0b77cec Merge pull request #26719 from AkihiroSuda/fix-race-builder-vs-container-1 
Fix a race found in TestBuildCancellationKillsSleep
 2016-10-10 18:54:55 +02:00
John Howard
e85867cb68 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-06 09:32:22 -07:00
Akihiro Suda
ed2e79fc03 Fix a race found in TestBuildCancellationKillsSleep 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-27 16:19:49 +00:00
Tõnis Tiigi
690882c2e7 Implement build cache based on history array 
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
 2016-09-23 11:30:06 -07:00
Vincent Demeester
72f556a9ff Merge pull request #26516 from yongtang/26453-build-bad-syntax 
Check bad syntax on dockerfile before building.
 2016-09-23 12:24:20 +02:00
Darren Stahl
309056648c Windows: Fix wildcard expansion after slash in filename 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-14 11:40:57 -07:00
Yong Tang
c8dc2b156a Check bad syntax on dockerfile before building. 
This fix tries to address the issue raised in 26453 where bad syntax
on dockerfile is not checked before building, thus user has to wait
before seeing error in dockerfile.

This fix fixes the issue by evaluating all the instructions and check
syntax before dockerfile is invoked actually.

All existing tests pass.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-13 21:43:10 -07:00
boucher
d8fef66b03 Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:52 -04:00
Michael Crosby
91e197d614 Add engine-api types to docker 
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-07 11:05:58 -07:00
Doug Davis
282b0aff08 Merge pull request #24978 from yongtang/24912-build-with-progress 
Add hint of progress to the output of `docker build`
 2016-08-18 16:10:48 -04:00
allencloud
0ead624473 add defer file.Close to avoid potential fd leak 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-10 08:36:09 +08:00
John Howard
755be795b4 Move directive out of globals 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-26 10:35:33 -07:00
Yong Tang
35418c1455 Add hint of progress to the output of docker build 
This fix tries to address the issue raised in 24912 where docker
build only consists of the current step without overall total steps.

This fix adds the overall total steps so that end user could follow
the progress of the docker build.

An additonal test has been added to cover the changes.

This fix fixes 24912.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-24 08:13:58 -07:00
Vincent Demeester
6daf3d2a78
Validate hostname starting from 1.24 API. 
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-06 09:13:59 +02:00
Otto Kekäläinen
644a7426cc Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
 2016-07-03 20:58:11 +03:00
danf
29b6a69660 Fix Malformed history layer - missing Sprintf in append of shell in Builder run config 
Signed-off-by: Dan Feldman <danf@jfrog.com>
 2016-06-28 11:09:39 +03:00
John Howard
b18ae8c9cc Builder default shell 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-03 13:54:31 -07:00
Tomasz Kopczynski
cf2611f323 Reimplementing more builder integration tests as unit tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-05-22 01:00:57 +02:00
John Howard
faab71701f Windows: Reduce CLI time, move some to unit tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-06 12:26:08 -07:00
Michael Crosby
2b97201e0c Merge pull request #22181 from Microsoft/jjh/workdir 
Windows: Consistent build workdir handling
 2016-04-26 16:51:09 -07:00
John Howard
0433801093 Windows: Consistent build workdir handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-04-26 15:32:52 -07:00
Yong Tang
5844736c14 Labels set on the command line always override labels in Dockerfile 
This fix tries to address the inconsistency in #22036 where labels
set on the command line will not override labels specified in
Dockerfile, but will override labels inherited from `FROM` images.

The fix add a LABEL with command line options at the end of the
processed Dockerfile so that command line options labels always
override the LABEL in Dockerfiles (or through `FROM`).

An integration test has been added for test cases specified in #22036.

This fix fixes #22036.

NOTE: Some changes are from #22266 (@tiborvass).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-04-23 18:49:17 -07:00
David Calavera
1a85c8ebbe Apply build labels to images with only a FROM tag. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-30 17:28:13 -04:00
Alexander Morozov
f2401a0f69 builder: replace cancelled channel with net/context 
Also stop execution of run immediately if request was cancelled.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 08:19:29 -07:00
Sebastiaan van Stijn
5ef04b1c6d Merge pull request #21268 from calavera/remove_dockerfile_from_api 
Remove dockerfile dependency from the API.
 2016-03-23 19:34:21 -07:00
Evan Hazlett
fc214b4408 add label support for build, networks and volumes 
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-03-22 11:49:06 -04:00
David Calavera
93e02efa90 Remove dockerfile dependency from the API. 
Move context parsing to the backend.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-16 22:06:29 -04:00