Create builder/command, cut libcontainer dependency on integration-cli

d1e9d07c introduces a dependency to libcontainer and other daemon
related packages through builder package. The only thing test needs
is set of the Dockerfile commands. Extracting them to a separate
package.

This was causing CI tests to not to compile on non-Linux platforms.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ccde3a1f73bb4f64845e736d3173eb6f6935971f
Component: engine
This commit is contained in:
Ahmet Alp Balkan
2015-02-11 21:18:48 -08:00
parent ebb652c696
commit b2dfebba9a
3 changed files with 66 additions and 33 deletions

View File

@ -19,7 +19,7 @@ import (
"text/template"
"time"
"github.com/docker/docker/builder"
"github.com/docker/docker/builder/command"
"github.com/docker/docker/pkg/archive"
)
@ -4828,7 +4828,6 @@ func TestBuildMissingArgs(t *testing.T) {
// Test to make sure that all Dockerfile commands (except the ones listed
// in skipCmds) will generate an error if no args are provided.
// Note: INSERT is deprecated so we exclude it because of that.
skipCmds := map[string]struct{}{
"CMD": {},
"RUN": {},
@ -4838,15 +4837,13 @@ func TestBuildMissingArgs(t *testing.T) {
defer deleteAllContainers()
for cmd := range builder.EvaluateTable {
var dockerfile string
for _, cmd := range command.Commands {
cmd = strings.ToUpper(cmd)
if _, ok := skipCmds[cmd]; ok {
continue
}
var dockerfile string
if cmd == "FROM" {
dockerfile = cmd
} else {