Skip to content

Commit c4ac83f

Browse files
committed
fix: use renovate comments and pull inside the try block
1 parent 4d1bd0a commit c4ac83f

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

renovate.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
{
1515
"customType": "regex",
1616
"managerFilePatterns": ["/^src/utils\\.ts$/"],
17-
"matchStrings": ["Image: string = \"(?<depName>[^:\"]+):(?<currentValue>[^\"]+)\""],
18-
"datasourceTemplate": "docker"
17+
"matchStrings": ["// renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\s+static readonly \\w+: string = \"[^:\"]+:(?<currentValue>[^\"]+)\";"]
1918
}
2019
]
2120
}

src/utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,11 @@ export class Utils {
422422
}
423423

424424
static readonly gclRegistryPrefix: string = "registry.gcl.local";
425+
// renovate: datasource=docker depName=registry
425426
static readonly gclRegistryImage: string = "registry:3.1.1";
427+
// renovate: datasource=docker depName=alpine/openssl
426428
static readonly gclOpensslImage: string = "alpine/openssl:3.5.7";
429+
// renovate: datasource=docker depName=curlimages/curl
427430
static readonly gclCurlImage: string = "curlimages/curl:8.21.0";
428431
static async startDockerRegistry (argv: Argv): Promise<void> {
429432
const gclRegistryCertVol = `${this.gclRegistryPrefix}.certs`;
@@ -487,9 +490,8 @@ export class Utils {
487490
this.gclRegistryImage,
488491
]);
489492

490-
await Utils.spawn([argv.containerExecutable, "pull", this.gclCurlImage]);
491-
492493
try {
494+
await Utils.spawn([argv.containerExecutable, "pull", this.gclCurlImage]);
493495
await execa(argv.containerExecutable, [
494496
"run", "--rm",
495497
"--network", gclRegistryNet,

0 commit comments

Comments
 (0)