From 239317f9e810121b9a43c395cede20c694aa6f0d Mon Sep 17 00:00:00 2001
From: Emmanuel Bruno <emmanuel.bruno@univ-tln.fr>
Date: Mon, 12 Dec 2022 19:56:54 +0100
Subject: [PATCH] fixes typos.
---
ci-wrappers.sh | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/ci-wrappers.sh b/ci-wrappers.sh
index 7e019cc..93dcd1b 100644
--- a/ci-wrappers.sh
+++ b/ci-wrappers.sh
@@ -9,8 +9,8 @@ _init() {
var_expand() {
if [ -z "${1-}" ] || [ $# -ne 1 ]; then
- printf 'var_expand: expected one argument\n' >&2;
- return 1;
+ printf 'var_expand: expected one argument\n' >&2
+ return 1
fi
eval printf '%s' "\"\${$1?}\""
}
@@ -86,7 +86,21 @@ install-ci-software() {
}
provision-docker-engine() {
- _check_variables VAGRANT_HTTP_PROXY VAGRANT_HTTPS_PROXY VAGRANT_NO_PROXY
+ _init
+ # _check_variables VAGRANT_HTTP_PROXY VAGRANT_HTTPS_PROXY VAGRANT_NO_PROXY
+ CI_DOCKER_ENGINE_HOME="${CI_WRAPPERS_HOME}/vagrant-docker-engine"
+ echo "Docker Vagrant Home: ${CI_DOCKER_ENGINE_HOME}"
+ if [ ! -f "${CI_DOCKER_ENGINE_HOME}" ]; then
+ git clone https://github.com/ebpro/VagrantDockerProvisioningUsage.git "${CI_DOCKER_ENGINE_HOME}"
+ fi
+ cd "${CI_DOCKER_ENGINE_HOME}" && vagrant up
+}
+
+use-vagrant-docker() {
+ VAGRANT_dockerNode1Path=$(vagrant global-status | grep ${1:-docker-node} | grep "running" | head -n 1 | cut -f 6 -d ' ')
+ [[ -f "$VAGRANT_dockerNode1Path/set-docker-env.sh" ]] &&
+ cd "${VAGRANT_dockerNode1Path}" &&
+ . ./set-docker-env.sh
}
_moveVBoxDefaultFolder() {
--
GitLab