Skip to content
Snippets Groups Projects
Unverified Commit d61ea8b9 authored by Michael Kriese's avatar Michael Kriese Committed by GitHub
Browse files

fix(batec): don't override versioning (#33919)

parent 4032f206
No related branches found
No related tags found
No related merge requests found
import { GlobalConfig } from '../../../config/global'; import { GlobalConfig } from '../../../config/global';
import type { RepoGlobalConfig } from '../../../config/types'; import type { RepoGlobalConfig } from '../../../config/types';
import { GitTagsDatasource } from '../../datasource/git-tags'; import { GitTagsDatasource } from '../../datasource/git-tags';
import { id as dockerVersioning } from '../../versioning/docker';
import { id as semverVersioning } from '../../versioning/semver'; import { id as semverVersioning } from '../../versioning/semver';
import { getDep } from '../dockerfile/extract'; import { getDep } from '../dockerfile/extract';
import type { ExtractConfig, PackageDependency } from '../types'; import type { ExtractConfig, PackageDependency } from '../types';
...@@ -10,10 +9,7 @@ import { extractAllPackageFiles } from '.'; ...@@ -10,10 +9,7 @@ import { extractAllPackageFiles } from '.';
const fixturesDir = 'lib/modules/manager/batect/__fixtures__'; const fixturesDir = 'lib/modules/manager/batect/__fixtures__';
function createDockerDependency(tag: string): PackageDependency { function createDockerDependency(tag: string): PackageDependency {
return { return getDep(tag);
...getDep(tag),
versioning: dockerVersioning,
};
} }
function createGitDependency(repo: string, version: string): PackageDependency { function createGitDependency(repo: string, version: string): PackageDependency {
......
import type { Category } from '../../../constants'; import type { Category } from '../../../constants';
import { DockerDatasource } from '../../datasource/docker';
import { GitTagsDatasource } from '../../datasource/git-tags'; import { GitTagsDatasource } from '../../datasource/git-tags';
import { extractAllPackageFiles, extractPackageFile } from './extract'; import { extractAllPackageFiles, extractPackageFile } from './extract';
...@@ -11,4 +12,4 @@ export const defaultConfig = { ...@@ -11,4 +12,4 @@ export const defaultConfig = {
fileMatch: ['(^|/)batect(-bundle)?\\.ya?ml$'], fileMatch: ['(^|/)batect(-bundle)?\\.ya?ml$'],
}; };
export const supportedDatasources = [GitTagsDatasource.id]; export const supportedDatasources = [DockerDatasource.id, GitTagsDatasource.id];
import { z } from 'zod'; import { z } from 'zod';
import { LooseArray, LooseRecord, Yaml } from '../../../util/schema-utils'; import { LooseArray, LooseRecord, Yaml } from '../../../util/schema-utils';
import { GitTagsDatasource } from '../../datasource/git-tags'; import { GitTagsDatasource } from '../../datasource/git-tags';
import { id as dockerVersioning } from '../../versioning/docker';
import { id as semverVersioning } from '../../versioning/semver'; import { id as semverVersioning } from '../../versioning/semver';
import { getDep } from '../dockerfile/extract'; import { getDep } from '../dockerfile/extract';
import type { PackageDependency } from '../types'; import type { PackageDependency } from '../types';
...@@ -30,10 +29,8 @@ export const BatectConfigSchema = Yaml.pipe( ...@@ -30,10 +29,8 @@ export const BatectConfigSchema = Yaml.pipe(
).catch([]), ).catch([]),
}), }),
).transform(({ containers, include }) => { ).transform(({ containers, include }) => {
const imageDependencies = containers.map((image) => ({ // TODO: @zharinov How to pass `registryAliases` to `getDep`?
...getDep(image), const imageDependencies = containers.map((image) => getDep(image));
versioning: dockerVersioning,
}));
const bundleDependencies: PackageDependency[] = []; const bundleDependencies: PackageDependency[] = [];
const fileIncludes: string[] = []; const fileIncludes: string[] = [];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment