Skip to content

Commit

Permalink
Add "maintainer" as keys for property based configuration.
Browse files Browse the repository at this point in the history
Related to #117 and #129
  • Loading branch information
rhuss committed Mar 20, 2015
1 parent 1fd9273 commit f33c05f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion doc/manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,9 @@ values in the `<build>` and `<run>` sections.
* **docker.restartPolicy.name** Container restart policy
* **docker.restartPolicy.retry** Max restrart retries if `on-failure` used
* **docker.user** Container user
* **docker.volumes.idx** defined a list of volumes to expose when building an image
* **docker.volumes.idx** defines a list of volumes to expose when building an image
* **docker.tags.idx** defines a list of tags to apply to a built image
* **docker.maintainer** defines the maintainer's email as used when building an image
* **docker.volumesFrom.idx** defines a list of image aliases from which
the volumes should be mounted of the container. The list semantics
is the same as for links (see above). For examples
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public enum ConfigKey {
USER,
VOLUMES,
TAGS,
MAINTAINER,
VOLUMES_FROM,
WAIT_LOG("wait.log"),
WAIT_TIME("wait.time"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ private BuildImageConfiguration extractBuildConfiguration(String prefix, Propert
.registry(withPrefix(prefix, REGISTRY, properties))
.volumes(listWithPrefix(prefix, VOLUMES, properties))
.tags(listWithPrefix(prefix, TAGS, properties))
.maintainer(withPrefix(prefix, MAINTAINER, properties))
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ private void validateBuildConfiguration(BuildImageConfiguration buildConfig) {
assertEquals(a("8080"), buildConfig.getPorts());
assertEquals("registry", buildConfig.getRegistry());
assertEquals(a("/foo"), buildConfig.getVolumes());
assertEquals("rhuss@redhat.com",buildConfig.getMaintainer());

validateEnv(buildConfig.getEnv());

Expand Down Expand Up @@ -234,6 +235,7 @@ private String[] getTestData() {
k(FROM), "image",
k(HOSTNAME), "subdomain",
k(LINKS) + ".1", "redis",
k(MAINTAINER), "rhuss@redhat.com",
k(MEMORY), "1",
k(MEMORY_SWAP), "1",
k(NAME), "image",
Expand Down

0 comments on commit f33c05f

Please sign in to comment.