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 support for labels during build with compose #32632

Merged
merged 3 commits into from Apr 21, 2017

Conversation

Projects
None yet
5 participants
@ColinHebert
Contributor

ColinHebert commented Apr 14, 2017

As per requested in docker/compose#4735, this is an update of the docker-compose schema to allow setting labels during the build process.

Add support for labels during build with compose
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Apr 14, 2017

Member

Oh! CI is failing because you need to run go generate for this. However, I think this change may have to go in a 3.3 format, not in 3.2 (not exactly sure when versions should be bumped for such changes);

21:42:22 The result of `go generate github.com/docker/docker/cli/compose/schema` differs
21:42:22 
21:42:22  M cli/compose/schema/bindata.go
21:42:22 
21:42:22 Please run `go generate github.com/docker/docker/cli/compose/schema`
Member

thaJeztah commented Apr 14, 2017

Oh! CI is failing because you need to run go generate for this. However, I think this change may have to go in a 3.3 format, not in 3.2 (not exactly sure when versions should be bumped for such changes);

21:42:22 The result of `go generate github.com/docker/docker/cli/compose/schema` differs
21:42:22 
21:42:22  M cli/compose/schema/bindata.go
21:42:22 
21:42:22 Please run `go generate github.com/docker/docker/cli/compose/schema`
@ColinHebert

This comment has been minimized.

Show comment
Hide comment
@ColinHebert

ColinHebert Apr 15, 2017

Contributor

@shin-, @dnephin, what is your recommendation? Should a new schema be created or can that addition be made to 3.2?

Contributor

ColinHebert commented Apr 15, 2017

@shin-, @dnephin, what is your recommendation? Should a new schema be created or can that addition be made to 3.2?

Run go generate github.com/docker/docker/cli/compose/schema
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Regenerate schema with the correct libraries
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
@dnephin

LGTM

We can create the new schema before the release.

@ColinHebert

This comment has been minimized.

Show comment
Hide comment
@ColinHebert

ColinHebert Apr 20, 2017

Contributor

Awesome, @dnephin @thaJeztah is there anything else I need to do?

Contributor

ColinHebert commented Apr 20, 2017

Awesome, @dnephin @thaJeztah is there anything else I need to do?

@vdemeester

LGTM 🐯

@vdemeester vdemeester merged commit bb5dfdb into moby:master Apr 21, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 32989 has succeeded
Details
janky Jenkins build Docker-PRs 41599 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 1829 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 12751 has succeeded
Details
z Jenkins build Docker-PRs-s390x 1674 has succeeded
Details
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah May 2, 2017

Member

@dnephin looks like these changes had to be moved to the 3.3 schema?

Member

thaJeztah commented May 2, 2017

@dnephin looks like these changes had to be moved to the 3.3 schema?

@dnephin

This comment has been minimized.

Show comment
Hide comment
@dnephin

dnephin May 2, 2017

Member

They will need to be, yes. This is in 17.06 is that right? I've added the milestone

Member

dnephin commented May 2, 2017

They will need to be, yes. This is in 17.06 is that right? I've added the milestone

@dnephin dnephin added this to the 17.06.0 milestone May 2, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah May 2, 2017

Member

Discussing with @dnephin on slack; we can make the schema change after #32743 is merged

Member

thaJeztah commented May 2, 2017

Discussing with @dnephin on slack; we can make the schema change after #32743 is merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment