Merge branch 'master' into simpler-build-upload

Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine

components/engine/buildfile_test.go

@@ -63,6 +63,12 @@ add foo /usr/lib/bla/bar`,
 	},
 }
 
+// FIXME: test building with a context
+
+// FIXME: test building with a local ADD as first command
+
+// FIXME: test building with 2 successive overlapping ADD commands
+
 func TestBuild(t *testing.T) {
 	for _, ctx := range testContexts {
 		runtime, err := newTestRuntime()