From ba039469ff5bac4f1fe236d811ba627743689606 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sat, 1 Jul 2023 19:23:17 +0200 Subject: [PATCH] fix(core): update --- ts/00_commitinfo_data.ts | 2 +- ts/manager.docker/mod.classes.dockerfile.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index ee3c33a..456cec2 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@shipzone/npmci', - version: '4.1.16', + version: '4.1.17', description: 'node and docker in gitlab ci on steroids' } diff --git a/ts/manager.docker/mod.classes.dockerfile.ts b/ts/manager.docker/mod.classes.dockerfile.ts index 0c2c032..fd77982 100644 --- a/ts/manager.docker/mod.classes.dockerfile.ts +++ b/ts/manager.docker/mod.classes.dockerfile.ts @@ -122,14 +122,14 @@ export class Dockerfile { */ public static dockerFileVersion(dockerfileInstanceArg: Dockerfile, dockerfileNameArg: string): string { let versionString: string; - const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; + const versionRegex = /Dockerfile_([^:_]*)$/; const regexResultArray = versionRegex.exec(dockerfileNameArg); if (regexResultArray && regexResultArray.length === 2) { versionString = regexResultArray[1]; } else { versionString = 'latest'; } - versionString.replace( + versionString = versionString.replace( '##version##', dockerfileInstanceArg.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version );