Skip to content

Commit

Permalink
Merge branch 'main' into feature/26447-Support-custom-environment-var…
Browse files Browse the repository at this point in the history
…iable-usage-in-Pipfile-source-URLs
  • Loading branch information
fivetide committed Apr 29, 2024
2 parents ae2178a + 0962edf commit efc4ac2
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ jobs:
show-progress: false

- name: docker-config
uses: containerbase/internal-tools@75d68da3c8cd3d622cf6d4b8d2dfe7e4dc33dfed # v3.0.78
uses: containerbase/internal-tools@955ceac764c7b5d3bdf644591152412dd97e3dc9 # v3.0.80
with:
command: docker-config

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ To get access to the token a custom Renovate Docker image is needed that include
The Dockerfile to create such an image can look like this:

```Dockerfile
FROM renovate/renovate:37.315.1
FROM renovate/renovate:37.326.3
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
# under "Installation" for "Debian/Ubuntu"
RUN ...
Expand Down
10 changes: 10 additions & 0 deletions docs/usage/self-hosted-experimental.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ Skip initializing `RE2` for regular expressions and instead use Node-native `Reg
## `RENOVATE_X_MERGE_CONFIDENCE_API_BASE_URL`

If set, Renovate will query this API for Merge Confidence data.

If you use the Mend Renovate Enterprise Edition (Renovate EE) and:

- have a static merge confidence token that you set via `MEND_RNV_MC_TOKEN`
- _or_ set `MEND_RNV_MC_TOKEN` to `auto`

Then you must set this variable at the _server_ and the _workers_.

But if you have specified the token as a [`matchConfidence`](https://docs.renovatebot.com/configuration-options/#matchconfidence) `hostRule`, you only need to set this variable at the _workers_.

This feature is in private beta.

## `RENOVATE_X_MERGE_CONFIDENCE_SUPPORTED_DATASOURCES`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"@renovatebot/pep440": "3.0.20",
"@renovatebot/ruby-semver": "3.0.23",
"@sindresorhus/is": "4.6.0",
"@types/better-sqlite3": "7.6.9",
"@types/better-sqlite3": "7.6.10",
"@types/ms": "0.7.34",
"@types/tmp": "0.2.6",
"@yarnpkg/core": "4.0.3",
Expand Down

0 comments on commit efc4ac2

Please sign in to comment.