Skip to content

Commit

Permalink
Add fix of #249 to changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
rhuss committed Dec 1, 2015
1 parent 4f02e68 commit bff284e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion doc/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
- Be more careful with chowing the user when <user> is used in an assembly (#336)
- Move VOLUME to the end of the Dockerfile to allow initialization via RUN commands (#341)
- Allow multiple configurations with different Docker hosts again (#320)

- docker:start blocks now only when system property docker.follow is given (#249)

* **0.13.6**
- Don't use user from image when pulling base images ([#147](https://github.com/rhuss/docker-maven-plugin/issues/147))
- Add a new assembly descriptor reference `hawt-app` for using asseblies created by
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/jolokia/docker/maven/StartMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public class StartMojo extends AbstractDockerMojo {
* @parameter property = "docker.showLogs"
*/
private String showLogs;

// whether to block during to start. Set it via Sysem property docker.follow
private boolean follow;

/**
Expand Down

0 comments on commit bff284e

Please sign in to comment.