Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(images-dependencies): implement images dependencies for dockerfi…
…le builder
- Loading branch information
1 parent
db03a32
commit f8b0204
Showing
19 changed files
with
992 additions
and
472 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package dockerfile_helpers | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/moby/buildkit/frontend/dockerfile/instructions" | ||
| ) | ||
|
|
||
| func ResolveDockerStagesFromValue(stages []instructions.Stage) { | ||
| nameToIndex := make(map[string]string) | ||
| for i, s := range stages { | ||
| name := strings.ToLower(s.Name) | ||
| index := strconv.Itoa(i) | ||
| if name != index { | ||
| nameToIndex[name] = index | ||
| } | ||
|
|
||
| for _, cmd := range s.Commands { | ||
| copyCmd, ok := cmd.(*instructions.CopyCommand) | ||
| if ok && copyCmd.From != "" { | ||
| from := strings.ToLower(copyCmd.From) | ||
| if val, ok := nameToIndex[from]; ok { | ||
| copyCmd.From = val | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func GetDockerTargetStageIndex(dockerStages []instructions.Stage, dockerTargetStage string) (int, error) { | ||
| if dockerTargetStage == "" { | ||
| return len(dockerStages) - 1, nil | ||
| } | ||
|
|
||
| for i, s := range dockerStages { | ||
| if s.Name == dockerTargetStage { | ||
| return i, nil | ||
| } | ||
| } | ||
|
|
||
| return -1, fmt.Errorf("%s is not a valid target build stage", dockerTargetStage) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package stage | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
|
|
||
| "github.com/werf/werf/pkg/config" | ||
| "github.com/werf/werf/pkg/util" | ||
| ) | ||
|
|
||
| type TestDependencies struct { | ||
| Dependencies []*TestDependency | ||
| ExpectedDigest string | ||
| } | ||
|
|
||
| type TestDependency struct { | ||
| ImageName string | ||
|
|
||
| TargetEnvImageName string | ||
| TargetEnvImageRepo string | ||
| TargetEnvImageTag string | ||
| TargetEnvImageID string | ||
|
|
||
| TargetBuildArgImageName string | ||
| TargetBuildArgImageRepo string | ||
| TargetBuildArgImageTag string | ||
| TargetBuildArgImageID string | ||
|
|
||
| DockerImageRepo string | ||
| DockerImageTag string | ||
| DockerImageID string | ||
| } | ||
|
|
||
| func (dep *TestDependency) GetDockerImageName() string { | ||
| return fmt.Sprintf("%s:%s", dep.DockerImageRepo, dep.DockerImageTag) | ||
| } | ||
|
|
||
| func (dep *TestDependency) ToConfigDependency() *config.Dependency { | ||
| depCfg := &config.Dependency{ImageName: dep.ImageName} | ||
|
|
||
| if dep.TargetEnvImageName != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageNameImport, | ||
| TargetEnv: dep.TargetEnvImageName, | ||
| }) | ||
| } | ||
| if dep.TargetEnvImageRepo != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageRepoImport, | ||
| TargetEnv: dep.TargetEnvImageRepo, | ||
| }) | ||
| } | ||
| if dep.TargetEnvImageTag != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageTagImport, | ||
| TargetEnv: dep.TargetEnvImageTag, | ||
| }) | ||
| } | ||
| if dep.TargetEnvImageID != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageIDImport, | ||
| TargetEnv: dep.TargetEnvImageID, | ||
| }) | ||
| } | ||
|
|
||
| if dep.TargetBuildArgImageName != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageNameImport, | ||
| TargetBuildArg: dep.TargetBuildArgImageName, | ||
| }) | ||
| } | ||
| if dep.TargetBuildArgImageRepo != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageRepoImport, | ||
| TargetBuildArg: dep.TargetBuildArgImageRepo, | ||
| }) | ||
| } | ||
| if dep.TargetBuildArgImageTag != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageTagImport, | ||
| TargetBuildArg: dep.TargetBuildArgImageTag, | ||
| }) | ||
| } | ||
| if dep.TargetBuildArgImageID != "" { | ||
| depCfg.Imports = append(depCfg.Imports, &config.DependencyImport{ | ||
| Type: config.ImageIDImport, | ||
| TargetBuildArg: dep.TargetBuildArgImageID, | ||
| }) | ||
| } | ||
|
|
||
| return depCfg | ||
| } | ||
|
|
||
| func GetConfigDependencies(dependencies []*TestDependency) (res []*config.Dependency) { | ||
| for _, dep := range dependencies { | ||
| res = append(res, dep.ToConfigDependency()) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| func CheckImageDependenciesAfterPrepare(img *LegacyImageStub, dependencies []*TestDependency) { | ||
| for _, dep := range dependencies { | ||
| if dep.TargetEnvImageName != "" { | ||
| Expect(img._Container._ServiceCommitChangeOptions.Env[dep.TargetEnvImageName]).To(Equal(dep.GetDockerImageName())) | ||
| } | ||
| if dep.TargetEnvImageRepo != "" { | ||
| Expect(img._Container._ServiceCommitChangeOptions.Env[dep.TargetEnvImageRepo]).To(Equal(dep.DockerImageRepo)) | ||
| } | ||
| if dep.TargetEnvImageTag != "" { | ||
| Expect(img._Container._ServiceCommitChangeOptions.Env[dep.TargetEnvImageTag]).To(Equal(dep.DockerImageTag)) | ||
| } | ||
| if dep.TargetEnvImageID != "" { | ||
| Expect(img._Container._ServiceCommitChangeOptions.Env[dep.TargetEnvImageID]).To(Equal(dep.DockerImageID)) | ||
| } | ||
|
|
||
| if dep.TargetBuildArgImageName != "" { | ||
| Expect(util.IsStringsContainValue(img._DockerfileImageBuilder.BuildDockerfileOptions.BuildArgs, fmt.Sprintf("%s=%s", dep.TargetBuildArgImageName, dep.GetDockerImageName()))) | ||
| } | ||
| if dep.TargetBuildArgImageRepo != "" { | ||
| Expect(util.IsStringsContainValue(img._DockerfileImageBuilder.BuildDockerfileOptions.BuildArgs, fmt.Sprintf("%s=%s", dep.TargetBuildArgImageRepo, dep.DockerImageRepo))) | ||
| } | ||
| if dep.TargetBuildArgImageTag != "" { | ||
| Expect(util.IsStringsContainValue(img._DockerfileImageBuilder.BuildDockerfileOptions.BuildArgs, fmt.Sprintf("%s=%s", dep.TargetBuildArgImageTag, dep.DockerImageTag))) | ||
| } | ||
| if dep.TargetBuildArgImageID != "" { | ||
| Expect(util.IsStringsContainValue(img._DockerfileImageBuilder.BuildDockerfileOptions.BuildArgs, fmt.Sprintf("%s=%s", dep.TargetBuildArgImageID, dep.DockerImageID))) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.