Skip to content

Commit 58abffd

Browse files
rhussrhuss
authored
Merge branch 'master' into pullReq626
2 parents 5e0aac5 + 885954a commit 58abffd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1907
-163
lines changed

‎doc/changelog.md‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# ChangeLog
22

3-
* **0.28-SNAPSHOT**
3+
* **0.29-SNAPSHOT**
4+
- Restore ANSI color to Maven logging if disabled during plugin execution and enable color for Windows with Maven 3.5.0 or later. Color logging is enabled by default, but disabled if the Maven CLI disables color (e.g. in batch mode) ([#1108](https://github.com/fabric8io/docker-maven-plugin/issues/1108))
5+
- Fix NPE if docker:save is called with -Dfile=file-name-only.tar ([#1203](https://github.com/fabric8io/docker-maven-plugin/issues/1203))
6+
- Improve GZIP compression performance for docker:save ([#1205](https://github.com/fabric8io/docker-maven-plugin/issues/1205))
7+
- Allow docker:save to attach image archive as a project artifact ([#1210](https://github.com/fabric8io/docker-maven-plugin/pull/1210))
8+
- Use pattern to detect image name in archive loaded during build and tag with image name from the project configuration ([#1207](https://github.com/fabric8io/docker-maven-plugin/issues/1207))
9+
10+
* **0.29.0** (2019-04-08)
11+
- Avoid failing docker:save when no images with build configuration are present ([#1185](https://github.com/fabric8io/docker-maven-plugin/issues/1185))
412
- Reintroduce minimal API-VERSION parameter in order to support docker versions below apiVersion 1.25
513
- docs: Correct default image naming
614
- Proxy settings are being ignored ([#1148](https://github.com/fabric8io/docker-maven-plugin/issues/1148))
@@ -10,12 +18,12 @@
1018
- Update to jnr-unixsocket 0.22
1119
- Support for new docker build --pull option (#1191)
1220
- Enhance @sha256 digest for tags in FROM (image_name:image_tag@sha256<digest>) ([#541](https://github.com/fabric8io/docker-maven-plugin/issues/541))
13-
- Support docker SHELL setting for runCmds (#1157)
14-
- Added 'autoRemove' option for running containers (#1179)
15-
- Added support for AWS EC2 instance roles when pushing to AWS ECR (#1186)
16-
- Introduce `contextDir` configuration option which would be used to specify docker build context (#1189)
17-
- Add support for auto-pulling multiple base image for multi stage builds (#1057)
18-
- Fix usage of credential helper that do not support 'version' command (#1159)
21+
- Support docker SHELL setting for runCmds ([#1157](https://github.com/fabric8io/docker-maven-plugin/issues/1157))
22+
- Added 'autoRemove' option for running containers ([#1179](https://github.com/fabric8io/docker-maven-plugin/issues/1179))
23+
- Added support for AWS EC2 instance roles when pushing to AWS ECR ([#1186](https://github.com/fabric8io/docker-maven-plugin/issues/1186))
24+
- Introduce `contextDir` configuration option which would be used to specify docker build context ([#1189](https://github.com/fabric8io/docker-maven-plugin/issues/1189))
25+
- Add support for auto-pulling multiple base image for multi stage builds ([#1057](https://github.com/fabric8io/docker-maven-plugin/issues/1057))
26+
- Fix usage of credential helper that do not support 'version' command ([#1159](https://github.com/fabric8io/docker-maven-plugin/issues/1159))
1927

2028
Please note that `dockerFileDir` is now deprecated in favor of `contextDir` which also allows absolute paths to Dockerfile with
2129
`dockerFile` and it will be removed in 1.0.0. It's still supported in this release but users are suggested to migrate to

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.fabric8</groupId>
88
<artifactId>docker-maven-plugin</artifactId>
9-
<version>0.28-SNAPSHOT</version>
9+
<version>0.29-SNAPSHOT</version>
1010
<packaging>maven-plugin</packaging>
1111

1212
<name>docker-maven-plugin</name>

‎samples/cargo-jolokia/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.28-SNAPSHOT</version>
25+
<version>0.29-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<groupId>io.fabric8</groupId>
3030
<artifactId>dmp-sample-cargo-jolokia</artifactId>
31-
<version>0.28-SNAPSHOT</version>
31+
<version>0.29-SNAPSHOT</version>
3232

3333
<url>http://www.jolokia.org</url>
3434

‎samples/custom-net/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<parent>
1414
<groupId>io.fabric8.dmp.samples</groupId>
1515
<artifactId>dmp-sample-parent</artifactId>
16-
<version>0.28-SNAPSHOT</version>
16+
<version>0.29-SNAPSHOT</version>
1717
<relativePath>../pom.xml</relativePath>
1818
</parent>
1919

2020
<artifactId>dmp-custom-net</artifactId>
21-
<version>0.28-SNAPSHOT</version>
21+
<version>0.29-SNAPSHOT</version>
2222

2323
<build>
2424
<plugins>

‎samples/data-jolokia/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.28-SNAPSHOT</version>
25+
<version>0.29-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>dmp-sample-data-jolokia</artifactId>
30-
<version>0.28-SNAPSHOT</version>
30+
<version>0.29-SNAPSHOT</version>
3131
<!-- add custom lifecycle -->
3232
<packaging>docker</packaging>
3333

‎samples/docker-compose/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<groupId>io.fabric8.dmp.samples</groupId>
2424
<artifactId>dmp-sample-parent</artifactId>
25-
<version>0.28-SNAPSHOT</version>
25+
<version>0.29-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>dmp-sample-docker-compose</artifactId>
30-
<version>0.28-SNAPSHOT</version>
30+
<version>0.29-SNAPSHOT</version>
3131

3232
<url>http://www.jolokia.org</url>
3333

‎samples/dockerfile/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.28-SNAPSHOT</version>
15+
<version>0.29-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919
<artifactId>dockerfile</artifactId>
20-
<version>0.28-SNAPSHOT</version>
20+
<version>0.29-SNAPSHOT</version>
2121
<packaging>war</packaging>
2222
<name>dmp-sample-dockerfile</name>
2323

‎samples/dockerignore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<parent>
1111
<groupId>io.fabric8.dmp.samples</groupId>
1212
<artifactId>dmp-sample-parent</artifactId>
13-
<version>0.28-SNAPSHOT</version>
13+
<version>0.29-SNAPSHOT</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

1717
<artifactId>dmp-sample-dockerignore</artifactId>
18-
<version>0.28-SNAPSHOT</version>
18+
<version>0.29-SNAPSHOT</version>
1919
<packaging>docker-build</packaging>
2020

2121
<build>

‎samples/healthcheck/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.28-SNAPSHOT</version>
15+
<version>0.29-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919
<artifactId>dmp-sample-healthcheck</artifactId>
20-
<version>0.28-SNAPSHOT</version>
20+
<version>0.29-SNAPSHOT</version>
2121

2222

2323
<build>

‎samples/helloworld/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>io.fabric8.dmp.samples</groupId>
1414
<artifactId>dmp-sample-parent</artifactId>
15-
<version>0.28-SNAPSHOT</version>
15+
<version>0.29-SNAPSHOT</version>
1616
<relativePath>../pom.xml</relativePath>
1717
</parent>
1818

1919

2020
<artifactId>dmp-sample-helloworld</artifactId>
21-
<version>0.28-SNAPSHOT</version>
21+
<version>0.29-SNAPSHOT</version>
2222
<packaging>jar</packaging>
2323
<name>dmp-sample-helloworld</name>
2424

0 commit comments

Comments
 (0)