Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ciwrappers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Emmanuel Bruno
ciwrappers
Commits
1229c3b3
Commit
1229c3b3
authored
2 years ago
by
Emmanuel Bruno
Browse files
Options
Downloads
Patches
Plain Diff
fixes typos.
parent
2bc8cc83
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ci-wrappers.sh
+2
-2
2 additions, 2 deletions
ci-wrappers.sh
with
2 additions
and
2 deletions
ci-wrappers.sh
+
2
−
2
View file @
1229c3b3
...
@@ -5,6 +5,7 @@ _E_TITLE='\033[0;0m'
...
@@ -5,6 +5,7 @@ _E_TITLE='\033[0;0m'
_init
()
{
_init
()
{
source
"
${
HOME
}
/.ci-wrappers/config"
source
"
${
HOME
}
/.ci-wrappers/config"
CI_DOCKER_ENGINE_HOME
=
"
${
CI_WRAPPERS_HOME
}
/vagrant-docker-engine"
}
}
var_expand
()
{
var_expand
()
{
...
@@ -88,7 +89,6 @@ install-ci-software() {
...
@@ -88,7 +89,6 @@ install-ci-software() {
provision-docker-engine
()
{
provision-docker-engine
()
{
_init
_init
# _check_variables VAGRANT_HTTP_PROXY VAGRANT_HTTPS_PROXY VAGRANT_NO_PROXY
# _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
}
"
echo
"Docker Vagrant Home:
${
CI_DOCKER_ENGINE_HOME
}
"
if
[
!
-d
"
${
CI_DOCKER_ENGINE_HOME
}
"
]
;
then
if
[
!
-d
"
${
CI_DOCKER_ENGINE_HOME
}
"
]
;
then
git clone
-q
https://github.com/ebpro/VagrantDockerProvisioningUsage.git
"
${
CI_DOCKER_ENGINE_HOME
}
"
&&
git clone
-q
https://github.com/ebpro/VagrantDockerProvisioningUsage.git
"
${
CI_DOCKER_ENGINE_HOME
}
"
&&
...
@@ -102,7 +102,7 @@ provision-docker-engine() {
...
@@ -102,7 +102,7 @@ provision-docker-engine() {
docker-vagrant
()
{
docker-vagrant
()
{
_init
_init
CI_DOCKER_ENGINE_HOME
=
"
${
CI_WRAPPERS_HOME
}
/vagrant
-docker-engine"
[[
!
-d
"
${
CI_DOCKER_ENGINE_HOME
}
"
]]
{
echo
"Vagrant Docker not provisioned run : provision
-docker-engine"
;
exit
0
;
}
CI_DOCKER_ENGINE_ID
=
$(
vagrant global-status|grep
"
$CI_DOCKER_ENGINE_HOME
"
|cut
-d
' '
-f
1
)
CI_DOCKER_ENGINE_ID
=
$(
vagrant global-status|grep
"
$CI_DOCKER_ENGINE_HOME
"
|cut
-d
' '
-f
1
)
# shellcheck disable=SC2068
# shellcheck disable=SC2068
vagrant
$@
"
$CI_DOCKER_ENGINE_ID
"
vagrant
$@
"
$CI_DOCKER_ENGINE_ID
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment