Commit 8b262e5e authored by Fabian Peter's avatar Fabian Peter
Browse files

fix: docker version

parent b137714a
......@@ -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_DESCRIPTION') | default(lookup('pipe', 'git log -1 --pretty=%B'), true) }}"
shipmate_commit_message: "{{ lookup('env', 'CI_COMMIT_MESSAGE') | 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) }}"
......
......@@ -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') }}"
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment