mirror of https://github.com/docker/compose.git
Merge pull request #961 from gtardif/compose_container_labels
Add container labels to improve compatibility with docker-compose
This commit is contained in:
commit
426b333dd8
|
@ -363,10 +363,15 @@ func getContainerCreateOptions(p *types.Project, s types.ServiceConfig, number i
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, nil, err
|
return nil, nil, nil, err
|
||||||
}
|
}
|
||||||
|
//TODO: change oneoffLabel value for containers started with `docker compose run`
|
||||||
labels := map[string]string{
|
labels := map[string]string{
|
||||||
projectLabel: p.Name,
|
projectLabel: p.Name,
|
||||||
serviceLabel: s.Name,
|
serviceLabel: s.Name,
|
||||||
|
versionLabel: ComposeVersion,
|
||||||
|
oneoffLabel: "False",
|
||||||
configHashLabel: hash,
|
configHashLabel: hash,
|
||||||
|
workingDirLabel: p.WorkingDir,
|
||||||
|
configFilesLabel: strings.Join(p.ConfigNames(), ","),
|
||||||
containerNumberLabel: strconv.Itoa(number),
|
containerNumberLabel: strconv.Itoa(number),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,17 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
projectLabel = "com.docker.compose.project"
|
|
||||||
serviceLabel = "com.docker.compose.service"
|
|
||||||
configHashLabel = "com.docker.compose.config-hash"
|
|
||||||
containerNumberLabel = "com.docker.compose.container-number"
|
containerNumberLabel = "com.docker.compose.container-number"
|
||||||
|
oneoffLabel = "com.docker.compose.oneoff"
|
||||||
|
projectLabel = "com.docker.compose.project"
|
||||||
|
workingDirLabel = "com.docker.compose.project.working_dir"
|
||||||
|
configFilesLabel = "com.docker.compose.project.config_files"
|
||||||
|
serviceLabel = "com.docker.compose.service"
|
||||||
|
versionLabel = "com.docker.compose.version"
|
||||||
|
configHashLabel = "com.docker.compose.config-hash"
|
||||||
|
|
||||||
|
//ComposeVersion Compose version
|
||||||
|
ComposeVersion = "1.0-alpha"
|
||||||
)
|
)
|
||||||
|
|
||||||
func projectFilter(projectName string) filters.KeyValuePair {
|
func projectFilter(projectName string) filters.KeyValuePair {
|
||||||
|
|
Loading…
Reference in New Issue