Commit Graph

34 Commits

Author SHA1 Message Date
Jamie Tanna 569dff1961 fix(manager/dockerfile): don't relabel the syntax dep as final (#45690)
fix(manager/dockerfile): only relabel last `stage` as `final`

If using a Docker image that only declares a `syntax`, with no base
image, we would incorrectly set the `depType: final`, when this isn't
actually an image.

Instead, we should make sure that we find the last `stage` dependency,
and then override that.

Co-authored-by: Claude Opus 5 <jamie.tanna+claude-code@mend.io>
2026-09-07 12:42:23 +00:00
Marius b22f58045e fix(manager): Handle variables with default values in registry aliases (#36293)
* fix(manager): handle registryAliases with shell variable defaults

Allows `registryAliases` keys to contain shell-style variables with
empty (or other) defaults, e.g. `${DEPENDENCY_PROXY:-}` or
`${CI_REGISTRY:-}`. The same image string is then resolved both
online (variable expanded) and offline (variable empty).

Changes in `dockerfile/extract.ts` (used by `gitlabci` too):
* Match the alias key as either `${name}/...` (existing) or `${name}...`
  when `name` already ends in a non-identifier boundary character such
  as `}`. Bare-identifier keys like `$CI_REGISTRY` continue to require
  the slash boundary so they no longer overmatch keys that begin with
  the same prefix (e.g. `$CI_REGISTRY` vs `$CI_REGISTRY_IMAGE`).
* Use `ensureTrailingSlash` to handle alias values that already include
  a trailing slash.
* Preserve the original `name` and path structure in `dep.depName`
  instead of substringing only after the alias `value`. This keeps the
  variable in the depName so it survives a `splitImageParts` round-trip
  and the resulting branch name comes out clean.

Adds `sanitizeDepName` regex passes in
`lib/workers/repository/updates/flatten.ts` so any leftover
`${VAR}`/`${VAR:-...}` placeholder is stripped from the depName before
it becomes a branch name (otherwise we'd get
`renovate/${dependency_proxy}python-3.x` instead of
`renovate/python-3.x`).

Tests cover:
* `${VAR:-}/image` (with slash) and `${VAR:-}image` (no slash, requires
  the boundary form).
* Overlapping prefixes: `$CI_REGISTRY` vs `$CI_REGISTRY_IMAGE`.
* Registry alias with port (`localhost:5000/repo`).
* `sanitizeDepName` strips `${VAR}` / `${VAR:-}` / bare `$VAR`.

Reproducer: https://github.com/Wayneoween/renovate-36293-repro

* revert(manager/gitlabci): keep regex group name as 'prefix'

Reverting the unrelated `prefix` -> `rawPrefix` rename in `depProxyRe`.
Per review on #36293, this rename is out of scope for the registry-alias
fix and just adds review surface.

* refactor(manager/dockerfile): narrow alias boundary check to '}'

Per review on #36293. The previous regex `/[^A-Za-z0-9_]$/` matched any
non-word ending, which is broader than the documented case (alias keys
ending in `}` from `${VAR}` / `${VAR:-...}`). Replace with a plain
`name.endsWith('}')` check, which also avoids re-building a regex on
every iteration of the alias loop.

Existing tests (`'variables with default and slash'`,
`'variables with default no slash'`, `'alias with digest only'`)
continue to exercise the `}`-boundary path; the `'overlapping prefixes'`
case continues to exercise the slash-only path.

* chore(manager/dockerfile): trim comment and TODO library/ strip edge

Per review on #36293:
* Drop the verbose explanation block above the depName-restore branch;
  the spec rows already document the expected shape.
* Add a TODO above the `dep.depName?.startsWith(valueWithSlash)` guard
  noting a pre-existing edge case: when the inner `getDep` strips a
  `library/` prefix (or similar) the depName no longer starts with
  `valueWithSlash`, so the alias-rooted depName is not restored. Out of
  scope for this PR.

* fix(manager/dockerfile): handle empty registry alias value

- strip trailing slash after ${VAR} placeholders in sanitizeDepName
- treat an empty registry alias value as Docker Hub instead of '/'
- clarify registry alias docs wording

* refactor(manager/dockerfile): drop redundant alias boundary guard

- `matchedAtBoundary` is only read behind `!matchedWithSlash`
- add docker-compose test for `${VAR:-}` registry aliases

* test(manager/dockerfile): pin special-prefix registry alias behavior

`getDep` strips `library/`, `amd64/` and `arm64/` as special prefixes, so
an alias whose value is one of those loses its alias-rooted `depName`.
Both the slash form and the variable form behave this way on `main`.
2026-09-03 12:43:47 +00:00
KBS 1f5f6dab2a fix(manager/dockerfile): handle single-quoted empty ARG default value (#44522)
ARG value unquoting only stripped double quotes, so ARG FOO='' kept the
literal '' and resolved FROM ${FOO}node to ''node. Strip single quotes too.

Co-authored-by: youdie006 <youdie006@users.noreply.github.com>
2026-07-21 10:48:29 +00:00
Sergei Zharinov 9d857c1f68 refactor(lint): Organize imports with biome (#40966) 2026-02-06 13:40:01 +00:00
Sergei Zharinov 930cf6633c refactor: Rewrite imports with .ts extensions (#40700)
fix: Additional vi.mock path corrections and prettier formatting
2026-01-26 22:48:17 +00:00
Daniel Linjama 71bdb25415 fix(dockerfile): replace all instances of arguments (#39747) 2025-12-08 19:26:44 +00:00
Sebastian Poxhofer 8e1e8c660a test(manager/docker): add test for COPY --from with digest (#35195) 2025-04-05 06:20:31 +00:00
Michael Kriese 19c115c813 test: cleanup (#34785) 2025-03-13 17:52:09 +00:00
Michael Kriese 5ffd464a8f fix: only replace prefix with registry alias (#33922) 2025-01-30 09:36:40 +00:00
Michael Kriese bf5ce6cc3a fix(manager): retain depName when using registryAliases (#33911) 2025-01-30 08:05:36 +00:00
Michael Kriese 45bdc77844 refactor(manager): always set package name from docker image extract (#33917) 2025-01-29 15:36:24 +00:00
Bas Schoenmaeckers 456765aeac feat(manager/dockerfile): add support for Dockerfile RUN --mount=from (#32743)
Co-authored-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-27 10:44:20 +00:00
Ed Harrod 894250d392 chore(manager/gomod): Update go version to 1.23.3 in tests/examples (#32514)
Co-authored-by: Rhys Arkins <rhys@arkins.net>
2024-11-13 15:45:18 +00:00
Mathieu Kniewallner 83132a534e fix(manager/docker): accept key-only arguments in COPY --from (#31344)
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
2024-09-12 11:29:23 +00:00
RahulGautamSingh 198de5843c fix(manager/dockerfile): remove bom marker (#30156) 2024-07-13 07:49:31 +00:00
Maxime Brunet edf661ff73 fix(dockerfile): handle codenames with registries (#28941) 2024-05-09 04:18:32 +00:00
renovate[bot] 4c2ce97bb4 build(deps): update dependency prettier to v3.2.2 (#26755)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Rhys Arkins <rhys@arkins.net>
2024-01-21 08:20:41 +00:00
Leon Grave 235d5127e9 feat(manager/dockerfile): Add syntax statement support (#25530)
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
Co-authored-by: Rhys Arkins <rhys@arkins.net>
Co-authored-by: Johannes Feichtner <343448+Churro@users.noreply.github.com>
2023-11-10 16:27:15 +00:00
renovate[bot] e5cbbaaf09 build(deps): update dependency prettier to v3 (#23627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sergei Zharinov <zharinov@users.noreply.github.com>
2023-11-07 17:12:01 +00:00
Sergei Zharinov b69416ce17 refactor(prettier): Force trailing commas (#25631) 2023-11-07 15:50:29 +00:00
Johannes Feichtner be21d44700 fix(docker): ensure digest is updated only once with ARG and multiple FROM statements (#18061) 2022-11-07 22:54:37 +00:00
Johannes Feichtner 4770c0069a fix(manager/dockerfile): improve RegEx to match ARG values with trailing spaces (#18592) 2022-10-27 07:06:41 +03:00
Michael Kriese a851aedfd2 fix(docker): skip empty and whitespace depName (#17644) 2022-09-06 06:57:20 +00:00
Johannes Feichtner c4127f994c fix(docker): use docker versioning for debian images with regular tags (#17602) 2022-09-04 08:08:51 +03:00
Benjamin Appel 551a40ccab feat(manager/dockerfile): add support for registryAliases (#17139)
Co-authored-by: Rhys Arkins <rhys@arkins.net>
Co-authored-by: Niko Hass <nikohass571@gmail.com>
Co-authored-by: Niko Haß <48032410+nikohass@users.noreply.github.com>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
2022-08-17 13:57:53 +00:00
Michael Kriese 0316a5e62d test: use jest v29 (#17151) 2022-08-16 14:22:29 +02:00
Florian Greinacher 2b582140c2 fix(manager/docker): use correct autoreplace string for registry aliases (#16542)
* fix(manager/docker): use correct autoreplace string for registry aliases

* fix: re-establish old behavior
2022-07-13 06:22:52 +00:00
Florian Greinacher 93c2d053a3 feat(manager/gitlabci): add support for registryAliases (#16227)
* feat(manager/gitlabci): add support for CI_REGISTRY

* fix: pass correct property

* chore: adapt tests

* docs; add documentation for the new option

* test: extend test cases

* fix: do the abc properly

* refactor: switch to using registryAliases option

* docs: mention registry variable

* style: remove extra heading

* docs: fix sentence

Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

* docs: move documentation to managers

* docs: fix formatting

* refactor: handle default value in function body

* refactor: remove unused function

* refactor: move registry alias handling to dockerfile manager

* style: remove unused import

* refactor: use match groups directly

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>

* refactor: add dockerfile manager tests

* chore: fix variable name

Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
2022-07-07 09:42:31 +02:00
Michael Kriese b4319928f1 refactor: strict manager tests (#16155)
* refactor: strict manager tests

* chore: revert changes

* Update lib/modules/manager/gradle/extract.spec.ts
2022-06-20 17:05:39 +02:00
Johannes Feichtner 44c67da0e1 feat(dockerfile): add support for escape chars and ARG instructions (#15751) 2022-06-06 05:47:17 +00:00
Gabriel-Ladzaretti c17a274de3 feat(versioning/debian): Debian codenames support (#14881)
* refactor(tools/distro-info): for later use in ubuntu and debian versioning

cr changes

* feat(versioning/debian): Debian codenames support

restore extracted code

* feat(versioning/debian): Debian codenames support

package.json, dropped the generate: prefix.

unit test mod as per CR

* feat(versioning/debian): Debian codenames support

now using the generic ver api interface

* feat(versioning/debian): Debian codenames support

revert exporting docker versioning

* feat(versioning/debian): Debian codenames support

switched to luxon for time handle
test fixes
dropped ts-ignore comments

* feat(versioning/debian): Debian codenames support

extract changes in distro.ts

* feat(versioning/debian): Debian codenames support

post merge changes

* feat(versioning/debian): Debian codenames support

cr changes

* feat(versioning/debian): Debian codenames support

 - added support for pin range strategy

* feat(versioning/debian): Debian codenames support

- typos & metadata fixes

* feat(versioning/debian): Debian codenames support

- added isReleased to distro.ts

* feat(versioning/debian): Debian codenames support

- moved all time/date handling into distro.ts

- date freeze for ubuntu/debian/distro unit tests

* refactor(versioning/distro): Move date handling into distro.ts

- revert refactor #15272

* feat(versioning/debian): Debian codenames support

 - merge distro refactor

* feat(versioning/debian): Debian codenames support

 - extract private properties

* feat(versioning/debian): Debian codenames support

  - cr changes

* feat(versioning/debian): Debian codenames support

  - cr changes

* feat(versioning/debian): Debian codenames support

  - cr changes

Co-authored-by: Jamie Magee <jamie.magee@gmail.com>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
2022-05-18 15:32:59 +00:00
Michael Kriese 64f5bd5f03 test: enforce lint style rules (#15085) 2022-04-12 14:49:49 +00:00
Rhys Arkins 143c9a6751 refactor: rename lookupName -> packageName (#14494)
Renames `lookupName` to be `packageName`.

BREAKING CHANGE: Use `packageName` instead of `lookupName` if interacting with Renovate datasources directly.
2022-03-04 09:04:02 +01:00
Rhys Arkins dca3418bbd refactor: lib/modules (#14488)
Moves datasource, manager, platform and versioning code from lib/ into new lib/modules/

BREAKING CHANGE: External tools must update paths to datasource, manager, platform and versioning
2022-03-04 09:04:02 +01:00