Merge pull request #92 from xenit-eu/upgrade-docker-plugin

Update bmuschko/gradle-docker-plugin to 6.1.2
xenit-eu · Jan 22, 2020 · a266868 · a266868
2 parents 3fe1cf1 + 8ef2174
commit a266868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixes
 
  * [#91](https://github.com/xenit-eu/alfresco-docker-gradle-plugin/pull/91) - Make pushDockerImage task depend on the buildDockerImage task
+ * [#92](https://github.com/xenit-eu/alfresco-docker-gradle-plugin/pull/92) - Fix pushDockerImage does not work with plain credentials in .docker/config.json
 
 ## Version 5.0.0 - 2020-01-20
 

diff --git a/build.gradle b/build.gradle
@@ -120,7 +120,7 @@ repositories {
 
 dependencies {
     packaged 'org.alfresco:alfresco-mmt:5.2.g'
-    compile 'com.bmuschko:gradle-docker-plugin:6.1.1'
+    compile 'com.bmuschko:gradle-docker-plugin:6.1.2'
     compile group: 'commons-io', name: 'commons-io', version: '2.5'
     compile 'com.avast.gradle:gradle-docker-compose-plugin:0.10.7'
     compile group: 'org.apache.commons', name: 'commons-compress', version: '1.5'

diff --git a/src/main/java/eu/xenit/gradle/docker/DockerBuildBehavior.java b/src/main/java/eu/xenit/gradle/docker/DockerBuildBehavior.java
@@ -86,7 +86,7 @@ public void execute(Project project) {
             dockerPushImage.setGroup("Docker");
             dockerPushImage.setDescription("Collection of all the pushTags");
             dockerPushImage.getImages().set(buildDockerImageProvider.flatMap(DockerBuildImage::getImages));
-            dockerPushImage.dependsOn(dockerPushImage);
+            dockerPushImage.dependsOn(buildDockerImageProvider);
         });
 
         project.getPlugins().withType(DockerComposePlugin.class, dockerComposePlugin -> {