From d61ea8b92bd77da0f72593f97b12ac3c6e14dde3 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Wed, 29 Jan 2025 17:49:57 +0100
Subject: [PATCH] fix(batec): don't override versioning (#33919)
---
lib/modules/manager/batect/extract.spec.ts | 6 +-----
lib/modules/manager/batect/index.ts | 3 ++-
lib/modules/manager/batect/schema.ts | 7 ++-----
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/modules/manager/batect/extract.spec.ts b/lib/modules/manager/batect/extract.spec.ts
index eaf2075522..d942f2397f 100644
--- a/lib/modules/manager/batect/extract.spec.ts
+++ b/lib/modules/manager/batect/extract.spec.ts
@@ -1,7 +1,6 @@
import { GlobalConfig } from '../../../config/global';
import type { RepoGlobalConfig } from '../../../config/types';
import { GitTagsDatasource } from '../../datasource/git-tags';
-import { id as dockerVersioning } from '../../versioning/docker';
import { id as semverVersioning } from '../../versioning/semver';
import { getDep } from '../dockerfile/extract';
import type { ExtractConfig, PackageDependency } from '../types';
@@ -10,10 +9,7 @@ import { extractAllPackageFiles } from '.';
const fixturesDir = 'lib/modules/manager/batect/__fixtures__';
function createDockerDependency(tag: string): PackageDependency {
- return {
- ...getDep(tag),
- versioning: dockerVersioning,
- };
+ return getDep(tag);
}
function createGitDependency(repo: string, version: string): PackageDependency {
diff --git a/lib/modules/manager/batect/index.ts b/lib/modules/manager/batect/index.ts
index de751ad550..a8811fc664 100644
--- a/lib/modules/manager/batect/index.ts
+++ b/lib/modules/manager/batect/index.ts
@@ -1,4 +1,5 @@
import type { Category } from '../../../constants';
+import { DockerDatasource } from '../../datasource/docker';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { extractAllPackageFiles, extractPackageFile } from './extract';
@@ -11,4 +12,4 @@ export const defaultConfig = {
fileMatch: ['(^|/)batect(-bundle)?\\.ya?ml$'],
};
-export const supportedDatasources = [GitTagsDatasource.id];
+export const supportedDatasources = [DockerDatasource.id, GitTagsDatasource.id];
diff --git a/lib/modules/manager/batect/schema.ts b/lib/modules/manager/batect/schema.ts
index a463b51a7c..c400448c07 100644
--- a/lib/modules/manager/batect/schema.ts
+++ b/lib/modules/manager/batect/schema.ts
@@ -1,7 +1,6 @@
import { z } from 'zod';
import { LooseArray, LooseRecord, Yaml } from '../../../util/schema-utils';
import { GitTagsDatasource } from '../../datasource/git-tags';
-import { id as dockerVersioning } from '../../versioning/docker';
import { id as semverVersioning } from '../../versioning/semver';
import { getDep } from '../dockerfile/extract';
import type { PackageDependency } from '../types';
@@ -30,10 +29,8 @@ export const BatectConfigSchema = Yaml.pipe(
).catch([]),
}),
).transform(({ containers, include }) => {
- const imageDependencies = containers.map((image) => ({
- ...getDep(image),
- versioning: dockerVersioning,
- }));
+ // TODO: @zharinov How to pass `registryAliases` to `getDep`?
+ const imageDependencies = containers.map((image) => getDep(image));
const bundleDependencies: PackageDependency[] = [];
const fileIncludes: string[] = [];
--
GitLab