Skip to content

Commit

Permalink
fix(batec): don't override versioning (#33919)
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice authored Jan 29, 2025
1 parent 4032f20 commit d61ea8b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
6 changes: 1 addition & 5 deletions lib/modules/manager/batect/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion lib/modules/manager/batect/index.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -11,4 +12,4 @@ export const defaultConfig = {
fileMatch: ['(^|/)batect(-bundle)?\\.ya?ml$'],
};

export const supportedDatasources = [GitTagsDatasource.id];
export const supportedDatasources = [DockerDatasource.id, GitTagsDatasource.id];
7 changes: 2 additions & 5 deletions lib/modules/manager/batect/schema.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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[] = [];
Expand Down

0 comments on commit d61ea8b

Please sign in to comment.