diff --git a/lib/modules/manager/batect/extract.spec.ts b/lib/modules/manager/batect/extract.spec.ts index eaf2075522e355077f12199c550ee1ef240e0c93..d942f2397fdabfeb4b819a84d1d02b3c21b00779 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 de751ad55097b89b9ce8bb7b0f691f4453ff8b58..a8811fc6644da37037f5ab96e289f7fe5c0796be 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 a463b51a7cb64e8d711f4be57fc0940022c10f81..c400448c0754852a07378359f705e62d993b7560 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[] = [];