You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/10 11:26:27 UTC
[42/50] archiva git commit: Fix for older docker versions
Fix for older docker versions
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/75f14a95
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/75f14a95
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/75f14a95
Branch: refs/heads/citest
Commit: 75f14a95d9fbe62de9c2529562e8a004d969fcb1
Parents: 8183ff1
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Jun 9 18:26:17 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Jun 9 18:26:17 2017 +0200
----------------------------------------------------------------------
src/ci/scripts/container_webtest.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/75f14a95/src/ci/scripts/container_webtest.sh
----------------------------------------------------------------------
diff --git a/src/ci/scripts/container_webtest.sh b/src/ci/scripts/container_webtest.sh
index 0b73d84..e06d5d2 100644
--- a/src/ci/scripts/container_webtest.sh
+++ b/src/ci/scripts/container_webtest.sh
@@ -39,6 +39,8 @@ TAG="${CONTAINER_NAME}:${CONTAINER_VERSION}"
START_ARG="$1"
+docker -v
+
function stop_instance() {
CONT=`docker ps -q --filter=name=${INSTANCE_NAME}`
if [ "${CONT}" != "" ]; then
@@ -55,7 +57,7 @@ function stop_instance() {
function start_instance() {
echo "Starting container ${INSTANCE_NAME}"
- docker run -d --network="${NETWORK_TYPE}" -p "${PORT_MAPPING}" --name "${INSTANCE_NAME}" "${TAG}"
+ docker run -d --net="${NETWORK_TYPE}" -p "${PORT_MAPPING}" --name "${INSTANCE_NAME}" "${TAG}"
}
function print_usage() {