Skip to content
Snippets Groups Projects
Commit c6428dd2 authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents b8a4961f bfc3196f
No related branches found
No related tags found
No related merge requests found
Pipeline #169980 passed
...@@ -19,7 +19,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -19,7 +19,7 @@ Add the following to your `.gitlab-ci.yml`:
```yaml ```yaml
include: include:
# 1: include the component # 1: include the component
- component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.6.1 - component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.7.0
# 2: set/override component inputs # 2: set/override component inputs
inputs: inputs:
args: "--no-banner" # ⚠ this is only an example args: "--no-banner" # ⚠ this is only an example
...@@ -33,7 +33,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -33,7 +33,7 @@ Add the following to your `.gitlab-ci.yml`:
include: include:
# 1: include the template # 1: include the template
- project: 'to-be-continuous/gitleaks' - project: 'to-be-continuous/gitleaks'
ref: '2.6.1' ref: '2.7.0'
file: '/templates/gitlab-ci-gitleaks.yml' file: '/templates/gitlab-ci-gitleaks.yml'
variables: variables:
......
...@@ -75,9 +75,6 @@ workflow: ...@@ -75,9 +75,6 @@ workflow:
- when: on_success - when: on_success
variables: variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
# Default Docker image (can be overridden) # Default Docker image (can be overridden)
GITLEAKS_IMAGE: $[[ inputs.image ]] GITLEAKS_IMAGE: $[[ inputs.image ]]
GITLEAKS_ARGS: $[[ inputs.args ]] GITLEAKS_ARGS: $[[ inputs.args ]]
...@@ -230,7 +227,7 @@ gitleaks: ...@@ -230,7 +227,7 @@ gitleaks:
entrypoint: [""] entrypoint: [""]
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "gitleaks", "2.6.1"] command: ["--service", "gitleaks", "2.7.0"]
stage: test stage: test
needs: [] needs: []
variables: variables:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment