From f20f6c95ca5be839ee89e01d02eab408bc582684 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Sun, 23 May 2021 15:46:05 +0530 Subject: [PATCH] [RELEASE] Update project version to 0.36.0 --- .circleci/config.yml | 2 +- doc/changelog.md | 2 +- it/builder/app-image/pom.xml | 2 +- it/builder/app/pom.xml | 2 +- it/builder/builder-image/pom.xml | 2 +- it/builder/pom.xml | 2 +- it/docker-compose/pom.xml | 4 ++-- it/dockerfile/pom.xml | 4 ++-- it/dockerignore/pom.xml | 4 ++-- it/healthcheck/pom.xml | 4 ++-- it/helloworld/pom.xml | 4 ++-- it/log/pom.xml | 4 ++-- it/multi-assembly/pom.xml | 4 ++-- it/net/pom.xml | 4 ++-- it/pom.xml | 2 +- it/properties/pom.xml | 4 ++-- it/run-java/pom.xml | 4 ++-- it/smallest/pom.xml | 4 ++-- it/spring-boot-with-jib/pom.xml | 4 ++-- it/volume/pom.xml | 4 ++-- it/zero-config/pom.xml | 4 ++-- pom.xml | 2 +- samples/build-cache/app/pom.xml | 2 +- samples/build-cache/image/pom.xml | 2 +- samples/build-cache/pom.xml | 4 ++-- samples/cargo-jolokia/pom.xml | 4 ++-- samples/copy-from-container/pom.xml | 2 +- samples/custom-net/pom.xml | 4 ++-- samples/data-jolokia/pom.xml | 4 ++-- samples/docker-compose/pom.xml | 4 ++-- samples/dockerfile/pom.xml | 4 ++-- samples/dockerignore/pom.xml | 4 ++-- samples/healthcheck/pom.xml | 4 ++-- samples/helloworld/pom.xml | 4 ++-- samples/log/pom.xml | 4 ++-- samples/multi-assembly/README.md | 10 ++++---- samples/multi-assembly/pom.xml | 4 ++-- samples/multi-wait/pom.xml | 4 ++-- samples/net/pom.xml | 4 ++-- samples/pom.xml | 2 +- samples/properties/pom.xml | 4 ++-- samples/run-java/pom.xml | 4 ++-- samples/smallest/pom.xml | 4 ++-- samples/spring-boot-with-jib/README.md | 32 +++++++++++++------------- samples/spring-boot-with-jib/pom.xml | 4 ++-- samples/volume/pom.xml | 4 ++-- samples/zero-config/pom.xml | 4 ++-- src/main/asciidoc/inc/_docker-tag.adoc | 4 ++-- 48 files changed, 101 insertions(+), 101 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 199dafd44..6a475d646 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: mvn clean install -DskipTests PROJECT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) cd it/ - find . -type f -exec sed -i 's/0.35-SNAPSHOT/'"$PROJECT_VERSION"'/g' {} + + find . -type f -exec sed -i 's/0.36.0/'"$PROJECT_VERSION"'/g' {} + mvn clean install - save_cache: key: dmp-{{ checksum "pom.xml" }} diff --git a/doc/changelog.md b/doc/changelog.md index 2d903c165..90da073c5 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,6 +1,6 @@ # ChangeLog -* **0.35-SNAPSHOT**: +* **0.36.0** (2021-05-23) - CI builds with Maven Wrapper to ensure that Maven Wrapper files and configuration are correct ([1450](https://github.com/fabric8io/docker-maven-plugin/issues/1450)) - Using properties in image configuration disables Docker cache during build ([1455](https://github.com/fabric8io/docker-maven-plugin/issues/1455)) - Update documentation to clearly state that `docker.cacheFrom.idx` is a _list_ property and should always be used with a `idx` suffix. With this change, `docker.cacheFrom` (without _idx_) is not considered anymore. diff --git a/it/builder/app-image/pom.xml b/it/builder/app-image/pom.xml index dcd64aa0e..ed11d2a67 100644 --- a/it/builder/app-image/pom.xml +++ b/it/builder/app-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.itests dmp-it-builder-parent - 0.35-SNAPSHOT + 0.36.0 dmp-it-builder-app-image diff --git a/it/builder/app/pom.xml b/it/builder/app/pom.xml index d65f7ecc5..0cf4a2e62 100644 --- a/it/builder/app/pom.xml +++ b/it/builder/app/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.itests dmp-it-builder-parent - 0.35-SNAPSHOT + 0.36.0 dmp-it-builder-app diff --git a/it/builder/builder-image/pom.xml b/it/builder/builder-image/pom.xml index 3d3bcca33..94dcc3f12 100644 --- a/it/builder/builder-image/pom.xml +++ b/it/builder/builder-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.itests dmp-it-builder-parent - 0.35-SNAPSHOT + 0.36.0 dmp-it-builder-builder-image diff --git a/it/builder/pom.xml b/it/builder/pom.xml index f9caf0ebe..3c9f3155e 100644 --- a/it/builder/pom.xml +++ b/it/builder/pom.xml @@ -28,7 +28,7 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml diff --git a/it/docker-compose/pom.xml b/it/docker-compose/pom.xml index 908a2d5b2..ed571cb05 100644 --- a/it/docker-compose/pom.xml +++ b/it/docker-compose/pom.xml @@ -22,12 +22,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-docker-compose - 0.35-SNAPSHOT + 0.36.0 http://www.jolokia.org diff --git a/it/dockerfile/pom.xml b/it/dockerfile/pom.xml index d994f278a..2d317e95c 100644 --- a/it/dockerfile/pom.xml +++ b/it/dockerfile/pom.xml @@ -12,12 +12,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dockerfile - 0.35-SNAPSHOT + 0.36.0 war dmp-it-dockerfile diff --git a/it/dockerignore/pom.xml b/it/dockerignore/pom.xml index 22a4e57ba..88140608d 100644 --- a/it/dockerignore/pom.xml +++ b/it/dockerignore/pom.xml @@ -10,12 +10,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-dockerignore - 0.35-SNAPSHOT + 0.36.0 docker-build diff --git a/it/healthcheck/pom.xml b/it/healthcheck/pom.xml index 891d8231c..36d799869 100644 --- a/it/healthcheck/pom.xml +++ b/it/healthcheck/pom.xml @@ -12,12 +12,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-healthcheck - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/helloworld/pom.xml b/it/helloworld/pom.xml index d00a90d38..b8cd58753 100644 --- a/it/helloworld/pom.xml +++ b/it/helloworld/pom.xml @@ -12,13 +12,13 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-helloworld - 0.35-SNAPSHOT + 0.36.0 jar dmp-it-helloworld diff --git a/it/log/pom.xml b/it/log/pom.xml index eefbb0c90..058b558ea 100644 --- a/it/log/pom.xml +++ b/it/log/pom.xml @@ -13,14 +13,14 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8 dmp-it-log - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/multi-assembly/pom.xml b/it/multi-assembly/pom.xml index f5bc6be3b..96d6fbefb 100644 --- a/it/multi-assembly/pom.xml +++ b/it/multi-assembly/pom.xml @@ -6,12 +6,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-multi-assembly - 0.35-SNAPSHOT + 0.36.0 jar Docker Maven Plugin Integration Test with Spring Boot with Multiple Layers diff --git a/it/net/pom.xml b/it/net/pom.xml index 2d13156e0..23ce8649f 100644 --- a/it/net/pom.xml +++ b/it/net/pom.xml @@ -16,12 +16,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-net - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/pom.xml b/it/pom.xml index 68b1d9b36..88f6ef4b3 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 pom http://www.jolokia.org diff --git a/it/properties/pom.xml b/it/properties/pom.xml index 853cfe510..853a61636 100644 --- a/it/properties/pom.xml +++ b/it/properties/pom.xml @@ -10,12 +10,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-properties - 0.35-SNAPSHOT + 0.36.0 docker-build diff --git a/it/run-java/pom.xml b/it/run-java/pom.xml index 8e396dbe1..11c7ae517 100644 --- a/it/run-java/pom.xml +++ b/it/run-java/pom.xml @@ -7,14 +7,14 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8.dmp.itests dmp-it-run-java jar - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/smallest/pom.xml b/it/smallest/pom.xml index 24e0891f3..8b03fb9bf 100644 --- a/it/smallest/pom.xml +++ b/it/smallest/pom.xml @@ -4,13 +4,13 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml fabric8io dmp-it-smallest - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/spring-boot-with-jib/pom.xml b/it/spring-boot-with-jib/pom.xml index 02ba97c04..ded91c453 100644 --- a/it/spring-boot-with-jib/pom.xml +++ b/it/spring-boot-with-jib/pom.xml @@ -6,12 +6,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-spring-boot-jib - 0.35-SNAPSHOT + 0.36.0 jar Docker Maven Plugin Integration test with Spring Boot With Build Mode JIB diff --git a/it/volume/pom.xml b/it/volume/pom.xml index 222fb50dd..aa542d312 100644 --- a/it/volume/pom.xml +++ b/it/volume/pom.xml @@ -15,12 +15,12 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-it-volume - 0.35-SNAPSHOT + 0.36.0 diff --git a/it/zero-config/pom.xml b/it/zero-config/pom.xml index 104766824..c73538052 100644 --- a/it/zero-config/pom.xml +++ b/it/zero-config/pom.xml @@ -7,7 +7,7 @@ io.fabric8.dmp.itests dmp-it-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml @@ -15,7 +15,7 @@ io.fabric8.dmp.itests dmp-it-zero-config jar - 0.35-SNAPSHOT + 0.36.0 ${project.build.directory}/${project.build.finalName}.jar diff --git a/pom.xml b/pom.xml index 343463682..cc7153278 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.fabric8 docker-maven-plugin - 0.35-SNAPSHOT + 0.36.0 maven-plugin docker-maven-plugin diff --git a/samples/build-cache/app/pom.xml b/samples/build-cache/app/pom.xml index 39305f915..4b89ace11 100644 --- a/samples/build-cache/app/pom.xml +++ b/samples/build-cache/app/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples.build-cache parent - 0.35-SNAPSHOT + 0.36.0 app diff --git a/samples/build-cache/image/pom.xml b/samples/build-cache/image/pom.xml index 0434616d8..2ee7a1364 100644 --- a/samples/build-cache/image/pom.xml +++ b/samples/build-cache/image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples.build-cache parent - 0.35-SNAPSHOT + 0.36.0 image diff --git a/samples/build-cache/pom.xml b/samples/build-cache/pom.xml index 02f5d2921..6c811c915 100644 --- a/samples/build-cache/pom.xml +++ b/samples/build-cache/pom.xml @@ -5,13 +5,13 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8.dmp.samples.build-cache parent - 0.35-SNAPSHOT + 0.36.0 pom diff --git a/samples/cargo-jolokia/pom.xml b/samples/cargo-jolokia/pom.xml index 123344d47..847a93621 100644 --- a/samples/cargo-jolokia/pom.xml +++ b/samples/cargo-jolokia/pom.xml @@ -22,13 +22,13 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8 dmp-sample-cargo-jolokia - 0.35-SNAPSHOT + 0.36.0 http://www.jolokia.org diff --git a/samples/copy-from-container/pom.xml b/samples/copy-from-container/pom.xml index dc5f856b1..692007944 100644 --- a/samples/copy-from-container/pom.xml +++ b/samples/copy-from-container/pom.xml @@ -4,7 +4,7 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-copy-from-container diff --git a/samples/custom-net/pom.xml b/samples/custom-net/pom.xml index 82bf21aa7..f6c05dbad 100644 --- a/samples/custom-net/pom.xml +++ b/samples/custom-net/pom.xml @@ -13,12 +13,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-custom-net - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/data-jolokia/pom.xml b/samples/data-jolokia/pom.xml index 8567b9712..58901c5c3 100644 --- a/samples/data-jolokia/pom.xml +++ b/samples/data-jolokia/pom.xml @@ -22,12 +22,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-data-jolokia - 0.35-SNAPSHOT + 0.36.0 docker diff --git a/samples/docker-compose/pom.xml b/samples/docker-compose/pom.xml index 3a1a302d3..1f73872dd 100644 --- a/samples/docker-compose/pom.xml +++ b/samples/docker-compose/pom.xml @@ -22,12 +22,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-docker-compose - 0.35-SNAPSHOT + 0.36.0 http://www.jolokia.org diff --git a/samples/dockerfile/pom.xml b/samples/dockerfile/pom.xml index 258481a16..1b6c7cf28 100644 --- a/samples/dockerfile/pom.xml +++ b/samples/dockerfile/pom.xml @@ -12,12 +12,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dockerfile - 0.35-SNAPSHOT + 0.36.0 war dmp-sample-dockerfile diff --git a/samples/dockerignore/pom.xml b/samples/dockerignore/pom.xml index f739fd4a1..83ef9f887 100644 --- a/samples/dockerignore/pom.xml +++ b/samples/dockerignore/pom.xml @@ -10,12 +10,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-dockerignore - 0.35-SNAPSHOT + 0.36.0 docker-build diff --git a/samples/healthcheck/pom.xml b/samples/healthcheck/pom.xml index b5cad9f41..cb0659489 100644 --- a/samples/healthcheck/pom.xml +++ b/samples/healthcheck/pom.xml @@ -12,12 +12,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-healthcheck - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml index a40092c35..65d7d7693 100644 --- a/samples/helloworld/pom.xml +++ b/samples/helloworld/pom.xml @@ -12,13 +12,13 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-helloworld - 0.35-SNAPSHOT + 0.36.0 jar dmp-sample-helloworld diff --git a/samples/log/pom.xml b/samples/log/pom.xml index b3736b658..e733ecd4c 100644 --- a/samples/log/pom.xml +++ b/samples/log/pom.xml @@ -13,14 +13,14 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8 dmp-sample-log - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/multi-assembly/README.md b/samples/multi-assembly/README.md index 67b2073db..b0cd51a9b 100644 --- a/samples/multi-assembly/README.md +++ b/samples/multi-assembly/README.md @@ -48,7 +48,7 @@ To build project issue this command: [INFO] Scanning for projects... [INFO] [INFO] ----------< io.fabric8.dmp.samples:dmp-sample-multi-assembly >---------- -[INFO] Building dmp-sample-multi-assembly 0.35-SNAPSHOT +[INFO] Building dmp-sample-multi-assembly 0.36.0 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ dmp-sample-multi-assembly --- @@ -69,9 +69,9 @@ To build project issue this command: [INFO] No tests to run. [INFO] [INFO] --- maven-jar-plugin:3.2.0:jar (default-jar) @ dmp-sample-multi-assembly --- -[INFO] Building jar: C:\Source\Other\docker-maven-plugin\samples\multi-assembly\target\dmp-sample-multi-assembly-0.35-SNAPSHOT.jar +[INFO] Building jar: C:\Source\Other\docker-maven-plugin\samples\multi-assembly\target\dmp-sample-multi-assembly-0.36.0.jar [INFO] -[INFO] --- docker-maven-plugin:0.35-SNAPSHOT:build (docker-build) @ dmp-sample-multi-assembly --- +[INFO] --- docker-maven-plugin:0.36.0:build (docker-build) @ dmp-sample-multi-assembly --- [INFO] Copying files to C:\Source\Other\docker-maven-plugin\samples\multi-assembly\target\docker\fabric8\dmp-sample-multi-assembly\build\deps [INFO] Copying files to C:\Source\Other\docker-maven-plugin\samples\multi-assembly\target\docker\fabric8\dmp-sample-multi-assembly\build\maven [INFO] Building tar: C:\Source\Other\docker-maven-plugin\samples\multi-assembly\target\docker\fabric8\dmp-sample-multi-assembly\tmp\docker-build.tar @@ -90,7 +90,7 @@ To build project issue this command: [INFO] DOCKER> Step 4/5 : COPY maven /app/ [INFO] DOCKER> [INFO] DOCKER> ---> 95f28fe7c902 -[INFO] DOCKER> Step 5/5 : CMD java -jar /app/dmp-sample-multi-assembly-0.35-SNAPSHOT.jar +[INFO] DOCKER> Step 5/5 : CMD java -jar /app/dmp-sample-multi-assembly-0.36.0.jar [INFO] DOCKER> [INFO] DOCKER> ---> Running in 6a784e62c7db [INFO] DOCKER> Removing intermediate container 6a784e62c7db @@ -110,7 +110,7 @@ You can verify that the image contains multiple layers using: > docker history --no-trunc fabric8/dmp-sample-multi-assembly:latest ```text IMAGE CREATED CREATED BY SIZE COMMENT -sha256:97d2a21984a25b3e278a784c2ef8078fcf677d322e6e73bb847baf8ee6bd7ef4 9 minutes ago /bin/sh -c #(nop) CMD ["/bin/sh" "-c" "java -jar /app/dmp-sample-multi-assembly-0.35-SNAPSHOT.jar"] 0B +sha256:97d2a21984a25b3e278a784c2ef8078fcf677d322e6e73bb847baf8ee6bd7ef4 9 minutes ago /bin/sh -c #(nop) CMD ["/bin/sh" "-c" "java -jar /app/dmp-sample-multi-assembly-0.36.0.jar"] 0B sha256:95f28fe7c9021870b123580d608b0b98da56507507873e354868235373363fce 9 minutes ago /bin/sh -c #(nop) COPY dir:a8f75e88983c2f1f68b80d3566291efed7b22db12c90389955fba7c78777a078 in /app/ 11.2kB sha256:5e275cc1bdd35f730d79c96918986a313917f3fbdba57a1ff44d977361a11739 12 days ago /bin/sh -c #(nop) COPY dir:a04b4e112f340915a2989954b7849d7b1426bac844c51935882d24dd3eacee06 in /app/lib/ 13.6MB sha256:2c5801f680604456b3111fb0a567c7403989478fe01fd0c81ab56f0ef28b7dca 12 days ago /bin/sh -c #(nop) EXPOSE 8080 0B diff --git a/samples/multi-assembly/pom.xml b/samples/multi-assembly/pom.xml index 0cd2923d5..8445fd715 100644 --- a/samples/multi-assembly/pom.xml +++ b/samples/multi-assembly/pom.xml @@ -6,12 +6,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-multi-assembly - 0.35-SNAPSHOT + 0.36.0 jar Docker Maven Plugin Example with Spring Boot with Multiple Layers diff --git a/samples/multi-wait/pom.xml b/samples/multi-wait/pom.xml index 4f1946687..5a9cfeb29 100644 --- a/samples/multi-wait/pom.xml +++ b/samples/multi-wait/pom.xml @@ -3,12 +3,12 @@ 4.0.0 io.fabric8 dmp-sample-multi-wait - 0.35-SNAPSHOT + 0.36.0 io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml diff --git a/samples/net/pom.xml b/samples/net/pom.xml index 6624824e8..50faf9502 100644 --- a/samples/net/pom.xml +++ b/samples/net/pom.xml @@ -16,12 +16,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-net - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/pom.xml b/samples/pom.xml index 74e70ad9f..93e2e4460 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -21,7 +21,7 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 pom http://www.jolokia.org diff --git a/samples/properties/pom.xml b/samples/properties/pom.xml index ca68fb2a0..f8535d696 100644 --- a/samples/properties/pom.xml +++ b/samples/properties/pom.xml @@ -10,12 +10,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-properties - 0.35-SNAPSHOT + 0.36.0 docker-build diff --git a/samples/run-java/pom.xml b/samples/run-java/pom.xml index fa27a5786..b746fc27a 100644 --- a/samples/run-java/pom.xml +++ b/samples/run-java/pom.xml @@ -7,14 +7,14 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml io.fabric8.dmp.samples dmp-sample-run-java jar - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/smallest/pom.xml b/samples/smallest/pom.xml index 97476247f..c7fa79c97 100644 --- a/samples/smallest/pom.xml +++ b/samples/smallest/pom.xml @@ -4,13 +4,13 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml fabric8io dmp-sample-smallest - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/spring-boot-with-jib/README.md b/samples/spring-boot-with-jib/README.md index 4e7ba307b..c6efeee18 100644 --- a/samples/spring-boot-with-jib/README.md +++ b/samples/spring-boot-with-jib/README.md @@ -45,23 +45,23 @@ To build project issue this command: [INFO] Scanning for projects... [INFO] [INFO] ---------< io.fabric8.dmp.samples:dmp-sample-spring-boot-jib >---------- -[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.33-SNAPSHOT +[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.36.0 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- docker-maven-plugin:0.33-SNAPSHOT:build (default-cli) @ dmp-sample-spring-boot-jib --- +[INFO] --- docker-maven-plugin:0.36.0:build (default-cli) @ dmp-sample-spring-boot-jib --- [INFO] DOCKER> Building Container image with JIB(Java Image Builder) mode [INFO] DOCKER> JIB image build started [INFO] DOCKER> Preparing assembly files [INFO] Copying files to /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/build/maven [INFO] Building tar: /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/tmp/docker-build.tar -[WARNING] Cannot include project artifact: io.fabric8.dmp.samples:dmp-sample-spring-boot-jib:jar:0.33-SNAPSHOT; it doesn't have an associated file or directory. +[WARNING] Cannot include project artifact: io.fabric8.dmp.samples:dmp-sample-spring-boot-jib:jar:0.36.0; it doesn't have an associated file or directory. [WARNING] The following patterns were never triggered in this artifact inclusion filter: o 'io.fabric8.dmp.samples:dmp-sample-spring-boot-jib' JIB> Base image 'fabric8/java-centos-openjdk8-jdk:1.5.6' does not use a specific image digest - build may not be reproducible JIB> Containerizing application with the following files: JIB> : JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/build/maven -JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/build/maven/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar +JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/build/maven/dmp-sample-spring-boot-jib-0.36.0.jar JIB> : JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-dmp-sample-jib/build/Dockerfile JIB> Getting manifest for base image fabric8/java-centos-openjdk8-jdk:1.5.6... @@ -70,7 +70,7 @@ JIB> Building layer... JIB> The base image requires auth. Trying again for fabric8/java-centos-openjdk8-jdk:1.5.6... JIB> Retrieving registry credentials for registry-1.docker.io... JIB> Using base image with digest: sha256:92530aa1eb4c49e3b1d033f94e9cd4dc891d49922459e13f84e59c9d68d800eb -JIB> Container program arguments set to [java, -jar, /maven/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar] +JIB> Container program arguments set to [java, -jar, /maven/dmp-sample-spring-boot-jib-0.36.0.jar] JIB> Building image to tar file... JIB> [======================== ] 80.0% complete > writing to tar file JIB> [==============================] 100.0% complete @@ -104,15 +104,15 @@ spring-boot-with-jib : $ mvn docker:push [INFO] Scanning for projects... [INFO] [INFO] ---------< io.fabric8.dmp.samples:dmp-sample-spring-boot-jib >---------- -[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.33-SNAPSHOT +[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.36.0 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- docker-maven-plugin:0.33-SNAPSHOT:push (default-cli) @ dmp-sample-spring-boot-jib --- +[INFO] --- docker-maven-plugin:0.36.0:push (default-cli) @ dmp-sample-spring-boot-jib --- [INFO] DOCKER> Pushing Container image with JIB(Java Image Builder) mode [INFO] DOCKER> This push refers to: rohankanojia/spring-boot-dmp-sample-jib JIB> Containerizing application with the following files: JIB> Retrieving registry credentials for registry-1.docker.io... -JIB> Container program arguments set to [java, -jar, /maven/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar] (inherited from base image) +JIB> Container program arguments set to [java, -jar, /maven/dmp-sample-spring-boot-jib-0.36.0.jar] (inherited from base image) JIB> Pushing manifest for latest... JIB> [==============================] 100.0% complete @@ -136,10 +136,10 @@ spring-boot-with-jib : $ mvn docker:build -PJib-With-Assembly [INFO] Scanning for projects... [INFO] [INFO] ---------< io.fabric8.dmp.samples:dmp-sample-spring-boot-jib >---------- -[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.33-SNAPSHOT +[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.36.0 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- docker-maven-plugin:0.33-SNAPSHOT:build (default-cli) @ dmp-sample-spring-boot-jib --- +[INFO] --- docker-maven-plugin:0.36.0:build (default-cli) @ dmp-sample-spring-boot-jib --- [INFO] DOCKER> Building Container image with JIB(Java Image Builder) mode [INFO] DOCKER> JIB image build started [INFO] DOCKER> Preparing assembly files @@ -150,7 +150,7 @@ JIB> : JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/my-project-assembly JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/my-project-assembly/static JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/my-project-assembly/static/testFile.txt -JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/my-project-assembly/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar +JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/my-project-assembly/dmp-sample-spring-boot-jib-0.36.0.jar JIB> : JIB> /home/rohaan/work/repos/docker-maven-plugin/samples/spring-boot-with-jib/target/docker/rohankanojia/spring-boot-sample/build/Dockerfile JIB> Getting manifest for base image fabric8/java-centos-openjdk8-jdk:1.5.6... @@ -159,7 +159,7 @@ JIB> Building layer... JIB> The base image requires auth. Trying again for fabric8/java-centos-openjdk8-jdk:1.5.6... JIB> Retrieving registry credentials for registry-1.docker.io... JIB> Using base image with digest: sha256:92530aa1eb4c49e3b1d033f94e9cd4dc891d49922459e13f84e59c9d68d800eb -JIB> Container program arguments set to [java, -jar, /my-project-assembly/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar] +JIB> Container program arguments set to [java, -jar, /my-project-assembly/dmp-sample-spring-boot-jib-0.36.0.jar] JIB> Building image to tar file... JIB> [======================== ] 80.0% complete > writing to tar file JIB> [==============================] 100.0% complete @@ -180,15 +180,15 @@ spring-boot-with-jib : $ mvn docker:push -PJib-With-Assembly [INFO] Scanning for projects... [INFO] [INFO] ---------< io.fabric8.dmp.samples:dmp-sample-spring-boot-jib >---------- -[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.33-SNAPSHOT +[INFO] Building Docker Maven Plugin :: Spring Boot JIB 0.36.0 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- docker-maven-plugin:0.33-SNAPSHOT:push (default-cli) @ dmp-sample-spring-boot-jib --- +[INFO] --- docker-maven-plugin:0.36.0:push (default-cli) @ dmp-sample-spring-boot-jib --- [INFO] DOCKER> Pushing Container image with JIB(Java Image Builder) mode [INFO] DOCKER> This push refers to: rohankanojia/spring-boot-sample JIB> Containerizing application with the following files: JIB> Retrieving registry credentials for registry-1.docker.io... -JIB> Container program arguments set to [java, -jar, /my-project-assembly/dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar] (inherited from base image) +JIB> Container program arguments set to [java, -jar, /my-project-assembly/dmp-sample-spring-boot-jib-0.36.0.jar] (inherited from base image) JIB> [==================== ] 66.7% complete > pushing blob sha256:0a2b4dc56d7e822495adcdfa8a2c2316e9ae420d84a6JIB> Skipping push; BLOB already exists on target registry : digest: sha256:707713df6baa24192428099d6444fed7fe3c91dc10bad2742b7350f0147b1b3b, size: 8851 JIB> [==================== ] 67.7% complete > pushing blob sha256:0a2b4dc56d7e822495adcdfa8a2c2316e9ae420d84a6JIB> Skipping push; BLOB already exists on target registry : digest: sha256:109b828942fdee847c02ec43b13105bf0d1bc1701675a4306781193f11c997df, size: 6543 JIB> [===================== ] 68.7% complete > pushing blob sha256:0a2b4dc56d7e822495adcdfa8a2c2316e9ae420d84a6JIB> Skipping push; BLOB already exists on target registry : digest: sha256:a44f5f69f08a44895565ad9cdfa05f3378a46205cf81c64de068efed4f644a46, size: 467 @@ -218,7 +218,7 @@ spring-boot-with-jib : $ docker container run -it rohankanojia/spring-boot-sampl Dockerfile bin dev home lib64 mnt opt root sbin sys usr anaconda-post.log deployments etc lib media my-project-assembly proc run srv tmp var [root@c402fe994291 /]# ls my-project-assembly/ -dmp-sample-spring-boot-jib-0.33-SNAPSHOT.jar static +dmp-sample-spring-boot-jib-0.36.0.jar static [root@c402fe994291 /]# ls my-project-assembly/static/ testFile.txt [root@c402fe994291 /]# cat my-project-assembly/static/testFile.txt diff --git a/samples/spring-boot-with-jib/pom.xml b/samples/spring-boot-with-jib/pom.xml index 631e4b4ea..422dbe33f 100644 --- a/samples/spring-boot-with-jib/pom.xml +++ b/samples/spring-boot-with-jib/pom.xml @@ -6,7 +6,7 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml @@ -114,7 +114,7 @@ io.fabric8 docker-maven-plugin - 0.33-SNAPSHOT + ${dmp.version} diff --git a/samples/volume/pom.xml b/samples/volume/pom.xml index 8596e0f5d..fdbc875d6 100644 --- a/samples/volume/pom.xml +++ b/samples/volume/pom.xml @@ -15,12 +15,12 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml dmp-sample-volume - 0.35-SNAPSHOT + 0.36.0 diff --git a/samples/zero-config/pom.xml b/samples/zero-config/pom.xml index 9d254edbe..dbbf80074 100644 --- a/samples/zero-config/pom.xml +++ b/samples/zero-config/pom.xml @@ -7,7 +7,7 @@ io.fabric8.dmp.samples dmp-sample-parent - 0.35-SNAPSHOT + 0.36.0 ../pom.xml @@ -15,7 +15,7 @@ io.fabric8.dmp.samples dmp-sample-zero-config jar - 0.35-SNAPSHOT + 0.36.0 ${project.build.directory}/${project.build.finalName}.jar diff --git a/src/main/asciidoc/inc/_docker-tag.adoc b/src/main/asciidoc/inc/_docker-tag.adoc index 89d259469..c18f517a8 100644 --- a/src/main/asciidoc/inc/_docker-tag.adoc +++ b/src/main/asciidoc/inc/_docker-tag.adoc @@ -9,10 +9,10 @@ The `{plugin}:tag` tags an image so that it becomes part of a repository. You ca [INFO] Scanning for projects... [INFO] [INFO] -----------< io.fabric8.dmp.samples:demp-sample-zero-config >----------- -[INFO] Building demp-sample-zero-config 0.33-SNAPSHOT +[INFO] Building demp-sample-zero-config [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- docker-maven-plugin:0.33-SNAPSHOT:tag (default-cli) @ demp-sample-zero-config --- +[INFO] --- docker-maven-plugin:dmpversion:tag (default-cli) @ demp-sample-zero-config --- [INFO] DOCKER> Tagging image samples/demp-sample-zero-config:0.9.0 successful! [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS