You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2015/11/21 19:54:29 UTC
yetus git commit: YETUS-196. default dockerfile isn't being used
Repository: yetus
Updated Branches:
refs/heads/master 37b482ed0 -> 2847c5896
YETUS-196. default dockerfile isn't being used
Signed-off-by: Kengo Seki <se...@nttdata.co.jp>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/2847c589
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/2847c589
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/2847c589
Branch: refs/heads/master
Commit: 2847c58964008d9697a954fb46b4a40c8b551a5f
Parents: 37b482e
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Nov 19 12:42:20 2015 -0800
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Sat Nov 21 10:53:02 2015 -0800
----------------------------------------------------------------------
precommit/core.d/docker.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/2847c589/precommit/core.d/docker.sh
----------------------------------------------------------------------
diff --git a/precommit/core.d/docker.sh b/precommit/core.d/docker.sh
index ceb3e19..fd46b91 100755
--- a/precommit/core.d/docker.sh
+++ b/precommit/core.d/docker.sh
@@ -30,7 +30,6 @@ function docker_initialize
add_footer_table "Docker" "${DOCKER_VERSION}"
fi
-
# turn DOCKERFAIL into a string composed of numbers
# to ease interpretation: 123, 213, 321, ... whatever
# some of these combos are non-sensical but that's ok.
@@ -66,6 +65,8 @@ function docker_initialize
fi
fi
popd >/dev/null
+ else
+ DOCKERFILE=${DOCKERFILE_DEFAULT}
fi
dockerverify
@@ -527,8 +528,8 @@ PatchSpecificDocker
--env=PROJECT_NAME="${PROJECT_NAME}" \
--env=TESTPATCHMODE="${TESTPATCHMODE}" \
"${patchimagename}"
- else
- exec "${DOCKERCMD}" run --rm=true -i \
+ else
+ exec "${DOCKERCMD}" run --rm=true -i \
${extraargs} \
-v "${PWD}:/testptch/${PROJECT_NAME}" \
-u "${USER_NAME}" \
@@ -541,7 +542,7 @@ PatchSpecificDocker
--env=PROJECT_NAME="${PROJECT_NAME}" \
--env=TESTPATCHMODE="${TESTPATCHMODE}" \
"${patchimagename}"
- fi
+ fi
}
## @description Switch over to a Docker container