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

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents 37e4728e 1850c740
No related branches found
No related tags found
No related merge requests found
Pipeline #170029 passed
...@@ -16,7 +16,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -16,7 +16,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/node/gitlab-ci-node@4.1.1 - component: $CI_SERVER_FQDN/to-be-continuous/node/gitlab-ci-node@4.2.0
# 2: set/override component inputs # 2: set/override component inputs
inputs: inputs:
image: "registry.hub.docker.com/library/node:20" # ⚠ this is only an example image: "registry.hub.docker.com/library/node:20" # ⚠ this is only an example
...@@ -31,7 +31,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -31,7 +31,7 @@ Add the following to your `.gitlab-ci.yml`:
include: include:
# 1: include the template # 1: include the template
- project: "to-be-continuous/node" - project: "to-be-continuous/node"
ref: "4.1.1" ref: "4.2.0"
file: "/templates/gitlab-ci-node.yml" file: "/templates/gitlab-ci-node.yml"
variables: variables:
...@@ -527,9 +527,9 @@ With: ...@@ -527,9 +527,9 @@ With:
```yaml ```yaml
include: include:
# main template # main template
- component: $CI_SERVER_FQDN/to-be-continuous/node/gitlab-ci-node@4.1.1 - component: $CI_SERVER_FQDN/to-be-continuous/node/gitlab-ci-node@4.2.0
# Vault variant # Vault variant
- component: $CI_SERVER_FQDN/to-be-continuous/node/gitlab-ci-node-vault@4.1.1 - component: $CI_SERVER_FQDN/to-be-continuous/node/gitlab-ci-node-vault@4.2.0
inputs: inputs:
# audience claim for JWT # audience claim for JWT
vault-oidc-aud: "https://vault.acme.host" vault-oidc-aud: "https://vault.acme.host"
......
...@@ -22,7 +22,7 @@ variables: ...@@ -22,7 +22,7 @@ variables:
.node-base: .node-base:
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "node", "4.1.1"] command: ["--service", "node", "4.2.0"]
- name: "$TBC_VAULT_IMAGE" - name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider" alias: "vault-secrets-provider"
variables: variables:
......
...@@ -194,8 +194,6 @@ workflow: ...@@ -194,8 +194,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 for Node # Default docker image for Node
NODE_IMAGE: $[[ inputs.image ]] NODE_IMAGE: $[[ inputs.image ]]
# Default Node project root directory # Default Node project root directory
...@@ -635,7 +633,7 @@ stages: ...@@ -635,7 +633,7 @@ stages:
image: $NODE_IMAGE image: $NODE_IMAGE
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "node", "4.1.1"] command: ["--service", "node", "4.2.0"]
variables: variables:
# Yarn cache (better than --cache-folder option, deprecated) # Yarn cache (better than --cache-folder option, deprecated)
YARN_CACHE_FOLDER: "$CI_PROJECT_DIR/$NODE_PROJECT_DIR/.yarn" YARN_CACHE_FOLDER: "$CI_PROJECT_DIR/$NODE_PROJECT_DIR/.yarn"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment