Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollback Docker dependencies filtering based on target #1620

Merged
merged 1 commit into from
Feb 7, 2019
Merged

Rollback Docker dependencies filtering based on target #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 2 additions & 45 deletions pkg/skaffold/docker/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func copiedFiles(nodes []*parser.Node) ([][]string, error) {
return copied, nil
}

func readDockerfile(workspace, absDockerfilePath string, target string, buildArgs map[string]*string) ([]string, error) {
func readDockerfile(workspace, absDockerfilePath string, buildArgs map[string]*string) ([]string, error) {
f, err := os.Open(absDockerfilePath)
if err != nil {
return nil, errors.Wrapf(err, "opening dockerfile: %s", absDockerfilePath)
Expand All @@ -202,11 +202,6 @@ func readDockerfile(workspace, absDockerfilePath string, target string, buildArg

expandBuildArgs(dockerfileLines, buildArgs)

dockerfileLines, err = forTarget(target, dockerfileLines)
if err != nil {
return nil, errors.Wrap(err, "filtering on target")
}

instructions, err := onbuildInstructions(dockerfileLines)
if err != nil {
return nil, errors.Wrap(err, "listing ONBUILD instructions")
Expand All @@ -220,44 +215,6 @@ func readDockerfile(workspace, absDockerfilePath string, target string, buildArg
return expandPaths(workspace, copied)
}

func forTarget(target string, nodes []*parser.Node) ([]*parser.Node, error) {
if target == "" {
return nodes, nil
}

byTarget := make(map[string][]*parser.Node)

var currentTarget string
for _, node := range nodes {
if node.Value == command.From {
currentTarget = fromInstruction(node).as
}

byTarget[currentTarget] = append(byTarget[currentTarget], node)
}

if _, present := byTarget[target]; !present {
return nil, fmt.Errorf("failed to reach build target %s in Dockerfile", target)
}

return nodesForTarget(target, byTarget), nil
}

func nodesForTarget(target string, nodesByTarget map[string][]*parser.Node) []*parser.Node {
var nodes []*parser.Node

for _, node := range nodesByTarget[target] {
if node.Value == command.From {
inst := fromInstruction(node)
nodes = append(nodes, nodesForTarget(inst.image, nodesByTarget)...)
}

nodes = append(nodes, node)
}

return nodes
}

func expandPaths(workspace string, copied [][]string) ([]string, error) {
expandedPaths := make(map[string]bool)
for _, files := range copied {
Expand Down Expand Up @@ -324,7 +281,7 @@ func GetDependencies(ctx context.Context, workspace string, a *latest.DockerArti
return nil, errors.Wrap(err, "normalizing dockerfile path")
}

deps, err := readDockerfile(workspace, absDockerfilePath, a.Target, a.BuildArgs)
deps, err := readDockerfile(workspace, absDockerfilePath, a.BuildArgs)
if err != nil {
return nil, err
}
Expand Down
38 changes: 0 additions & 38 deletions pkg/skaffold/docker/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,6 @@ FROM jboss/wildfly:14.0.1.Final
ADD ./file /etc/file
`

const targets = `
FROM scratch as target1
ADD ./file /etc/file
FROM target1 as target2
ADD ./bar /etc/bar
FROM target2
ADD ./server.go /etc/server.go
`

type fakeImageFetcher struct {
fetched []string
}
Expand Down Expand Up @@ -228,40 +219,12 @@ func TestGetDependencies(t *testing.T) {
workspace string
ignore string
buildArgs map[string]*string
target string

expected []string
fetched []string
badReader bool
shouldErr bool
}{
{
description: "no target",
dockerfile: targets,
workspace: ".",
expected: []string{"Dockerfile", "bar", "file", "server.go"},
},
{
description: "target",
dockerfile: targets,
workspace: ".",
target: "target1",
expected: []string{"Dockerfile", "file"},
},
{
description: "transitive target",
dockerfile: targets,
workspace: ".",
target: "target2",
expected: []string{"Dockerfile", "bar", "file"},
},
{
description: "unknown target",
dockerfile: targets,
workspace: ".",
target: "target3",
shouldErr: true,
},
{
description: "copy dependency",
dockerfile: copyServerGo,
Expand Down Expand Up @@ -537,7 +500,6 @@ func TestGetDependencies(t *testing.T) {
deps, err := GetDependencies(context.Background(), workspace, &latest.DockerArtifact{
DockerfilePath: "Dockerfile",
BuildArgs: test.buildArgs,
Target: test.target,
})

testutil.CheckErrorAndDeepEqual(t, test.shouldErr, err, test.expected, deps)
Expand Down