Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
wearep3r
shipmate
Commits
8b262e5e
Commit
8b262e5e
authored
Jul 25, 2020
by
Fabian Peter
Browse files
fix: docker version
parent
b137714a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
playbooks/group_vars/all.yml
playbooks/group_vars/all.yml
+1
-1
playbooks/shipmate-ahoi.yml
playbooks/shipmate-ahoi.yml
+2
-2
shipmate.gitlab-ci.yml
shipmate.gitlab-ci.yml
+2
-2
No files found.
playbooks/group_vars/all.yml
View file @
8b262e5e
...
...
@@ -20,7 +20,7 @@ shipmate_version_file: "{{ lookup('env','SHIPMATE_VERSION_FILE') | default('VERS
shipmate_shipfile
:
"
{{
lookup('env','SHIPMATE_SHIPFILE')
|
default('shipmate.env',
true)
}}"
shipmate_commit_id
:
"
{{
lookup('env',
'CI_COMMIT_SHA')
|
default(lookup('pipe',
'git
rev-parse
HEAD'),
true)
}}"
shipmate_commit_message
:
"
{{
lookup('env',
'CI_COMMIT_
D
ES
CRIPTION
')
|
default(lookup('pipe',
'git
log
-1
--pretty=%B'),
true)
}}"
shipmate_commit_message
:
"
{{
lookup('env',
'CI_COMMIT_
M
ES
SAGE
')
|
default(lookup('pipe',
'git
log
-1
--pretty=%B'),
true)
}}"
shipmate_default_branch
:
"
{{
lookup('env',
'CI_DEFAULT_BRANCH')
|
default(lookup('pipe',
'git
rev-parse
--abbrev-ref
HEAD'),
true)
}}"
shipmate_branch
:
"
{{
lookup('env',
'CI_COMMIT_REF_NAME')
|
default(shipmate_default_branch,
true)
}}"
shipmate_ci_stage
:
"
{{
lookup('env',
'CI_JOB_STAGE')
|
default('tag',
true)
}}"
...
...
playbooks/shipmate-ahoi.yml
View file @
8b262e5e
...
...
@@ -9,7 +9,7 @@
failed_when
:
false
ignore_errors
:
True
no_log
:
True
-
name
:
Discovering providers
include
:
"
provider-discovery.yml"
...
...
@@ -51,7 +51,7 @@
-
"
Shipmate
Commit
ID:
{{
shipmate_commit_id
}}"
-
"
Shimate
Commit
Message:
{{
shipmate_commit_message
}}"
-
"
Shipmate
Docker
Image:
{{
docker_image
}}"
-
"
Shipmate
Providers:
{{
shipmate_providers
_string
}}"
-
"
Shipmate
Providers:
{{
shipmate_providers
}}"
-
"
Shipmate
Merge
Request
ID:
{{
lookup('env',
'CI_MERGE_REQUEST_ID')
|
default('UNKNOWN',
true)
}}"
-
"
Shipmate
Merge
Request
IID:
{{
lookup('env',
'CI_MERGE_REQUEST_IID')
|
default('UNKNOWN',
true)
}}"
-
"
Shipmate
Cargo
Version:
{{
shipmate_cargo_version
|
default('UKNOWN')
}}"
...
...
shipmate.gitlab-ci.yml
View file @
8b262e5e
...
...
@@ -136,7 +136,7 @@ build:
extends
:
-
.shipmate:rules:tag
services
:
-
docker:19.03.
8
-dind
-
docker:19.03.
12
-dind
script
:
-
cd /shipmate
-
make stuff
...
...
@@ -148,7 +148,7 @@ ship:
extends
:
-
.shipmate:rules:ship
services
:
-
docker:19.03.
8
-dind
-
docker:19.03.
12
-dind
script
:
-
cd /shipmate
-
make stuff
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment