[openwhisk] branch master updated: Patch docker.gradle to use podman cleanly (#4891)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 154faf9  Patch docker.gradle to use podman cleanly (#4891)
154faf9 is described below

commit 154faf985262f4fd0e06ca55b0fc96b6e37c3965
Author: Jonathan Springer <jo...@gmail.com>
AuthorDate: Wed Apr 29 00:03:30 2020 -0400

    Patch docker.gradle to use podman cleanly (#4891)
---
 gradle/docker.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index 398dd50..4578857 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -112,13 +112,14 @@ def prepareBuildArgs(List buildArgs) {
 task tagImage {
     doLast {
         def versionString = (dockerBinary + ['-v']).execute().text
-        def matched = (versionString =~ /(\d+)\.(\d+)\.(\d+)/)
+        def matched = (versionString =~ /^(\S+) version (\d+)\.(\d+)\.(\d+)/)
 
-        def major = matched[0][1] as int
-        def minor = matched[0][2] as int
+        def runner = matched[0][1]
+        def major = matched[0][2] as int
+        def minor = matched[0][3] as int
 
         def dockerCmd = ['tag']
-        if(major == 1 && minor < 12) {
+        if(runner == 'Docker' && major == 1 && minor < 12) {
             dockerCmd += ['-f']
         }
         retry(dockerBinary + dockerCmd + [dockerImageName, dockerTaggedImageName], dockerRetries, dockerTimeout)