-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1453 from dgageot/error-gcb
Clear error message for unsupported artifact on GCB
- Loading branch information
Showing
5 changed files
with
196 additions
and
77 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,43 @@ | ||
| /* | ||
| Copyright 2018 The Skaffold Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package gcb | ||
|
|
||
| import ( | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest" | ||
| cloudbuild "google.golang.org/api/cloudbuild/v1" | ||
| ) | ||
|
|
||
| func (b *Builder) dockerBuildSteps(imageName string, artifact *latest.DockerArtifact) []*cloudbuild.BuildStep { | ||
| var steps []*cloudbuild.BuildStep | ||
|
|
||
| for _, cacheFrom := range artifact.CacheFrom { | ||
| steps = append(steps, &cloudbuild.BuildStep{ | ||
| Name: b.DockerImage, | ||
| Args: []string{"pull", cacheFrom}, | ||
| }) | ||
| } | ||
|
|
||
| args := append([]string{"build", "--tag", imageName, "-f", artifact.DockerfilePath}) | ||
| args = append(args, docker.GetBuildArgs(artifact)...) | ||
| args = append(args, ".") | ||
|
|
||
| return append(steps, &cloudbuild.BuildStep{ | ||
| Name: b.DockerImage, | ||
| Args: args, | ||
| }) | ||
| } |
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,100 @@ | ||
| /* | ||
| Copyright 2018 The Skaffold Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package gcb | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util" | ||
| "github.com/GoogleContainerTools/skaffold/testutil" | ||
| cloudbuild "google.golang.org/api/cloudbuild/v1" | ||
| ) | ||
|
|
||
| func TestDockerBuildDescription(t *testing.T) { | ||
| artifact := &latest.Artifact{ | ||
| ImageName: "nginx", | ||
| ArtifactType: latest.ArtifactType{ | ||
| DockerArtifact: &latest.DockerArtifact{ | ||
| DockerfilePath: "Dockerfile", | ||
| BuildArgs: map[string]*string{ | ||
| "arg1": util.StringPtr("value1"), | ||
| "arg2": nil, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| builder := Builder{ | ||
| GoogleCloudBuild: &latest.GoogleCloudBuild{ | ||
| DockerImage: "docker/docker", | ||
| DiskSizeGb: 100, | ||
| MachineType: "n1-standard-1", | ||
| Timeout: "10m", | ||
| }, | ||
| } | ||
| desc, err := builder.buildDescription(artifact, "bucket", "object") | ||
|
|
||
| expected := cloudbuild.Build{ | ||
| LogsBucket: "bucket", | ||
| Source: &cloudbuild.Source{ | ||
| StorageSource: &cloudbuild.StorageSource{ | ||
| Bucket: "bucket", | ||
| Object: "object", | ||
| }, | ||
| }, | ||
| Steps: []*cloudbuild.BuildStep{{ | ||
| Name: "docker/docker", | ||
| Args: []string{"build", "--tag", "nginx", "-f", "Dockerfile", "--build-arg", "arg1=value1", "--build-arg", "arg2", "."}, | ||
| }}, | ||
| Images: []string{artifact.ImageName}, | ||
| Options: &cloudbuild.BuildOptions{ | ||
| DiskSizeGb: 100, | ||
| MachineType: "n1-standard-1", | ||
| }, | ||
| Timeout: "10m", | ||
| } | ||
|
|
||
| testutil.CheckErrorAndDeepEqual(t, false, err, expected, *desc) | ||
| } | ||
|
|
||
| func TestPullCacheFrom(t *testing.T) { | ||
| artifact := &latest.DockerArtifact{ | ||
| DockerfilePath: "Dockerfile", | ||
| CacheFrom: []string{"from/image1", "from/image2"}, | ||
| } | ||
|
|
||
| builder := Builder{ | ||
| GoogleCloudBuild: &latest.GoogleCloudBuild{ | ||
| DockerImage: "docker/docker", | ||
| }, | ||
| } | ||
| steps := builder.dockerBuildSteps("nginx2", artifact) | ||
|
|
||
| expected := []*cloudbuild.BuildStep{{ | ||
| Name: "docker/docker", | ||
| Args: []string{"pull", "from/image1"}, | ||
| }, { | ||
| Name: "docker/docker", | ||
| Args: []string{"pull", "from/image2"}, | ||
| }, { | ||
| Name: "docker/docker", | ||
| Args: []string{"build", "--tag", "nginx2", "-f", "Dockerfile", "--cache-from", "from/image1", "--cache-from", "from/image2", "."}, | ||
| }} | ||
|
|
||
| testutil.CheckDeepEqual(t, expected, steps) | ||
| } |