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.

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

add tags property to build section #9481

Merged
merged 1 commit into from
May 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pkg/compose/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
sessionConfig = append(sessionConfig, p)
}

if len(service.Build.Tags) > 0 {
tags = append(tags, service.Build.Tags...)
}

return build.Options{
Inputs: build.Inputs{
ContextPath: service.Build.Context,
Expand Down
21 changes: 21 additions & 0 deletions pkg/e2e/compose_build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,24 @@ func TestBuildSecrets(t *testing.T) {
res.Assert(t, icmd.Success)
})
}

func TestBuildTags(t *testing.T) {
c := NewParallelE2eCLI(t, binDir)

t.Run("build with tags", func(t *testing.T) {

// ensure local test run does not reuse previously build image
c.RunDockerOrExitError("rmi", "build-test-tags")

c.RunDockerComposeCmd("--project-directory", "./fixtures/build-test/tags", "build", "--no-cache")

res := c.RunDockerCmd("image", "inspect", "build-test-tags")
expectedOutput := `"RepoTags": [
"docker/build-test-tags:1.0.0",
"build-test-tags:latest",
"other-image-name:v1.0.0"
],
`
res.Assert(t, icmd.Expected{Out: expectedOutput})
})
}
17 changes: 17 additions & 0 deletions pkg/e2e/fixtures/build-test/tags/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2020 Docker Compose CLI 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.

FROM nginx:alpine

RUN echo "SUCCESS"
9 changes: 9 additions & 0 deletions pkg/e2e/fixtures/build-test/tags/compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
services:
nginx:
image: build-test-tags
build:
context: .
tags:
- docker.io/docker/build-test-tags:1.0.0
- other-image-name:v1.0.0