Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2024-09-05 14:50:41 +02:00
parent 90317eb583
commit 3606843e44
3 changed files with 31 additions and 12 deletions
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/backend-common': patch
'@backstage/plugin-techdocs-node': patch
---
Internal fixes to match `testcontainers` update
@@ -64,11 +64,19 @@ export class DockerContainerRunner implements ContainerRunner {
if (pullImage) {
await new Promise<void>((resolve, reject) => {
this.dockerClient.pull(imageName, pullOptions, (err, stream) => {
if (err) return reject(err);
stream.pipe(logStream, { end: false });
stream.on('end', () => resolve());
stream.on('error', (error: Error) => reject(error));
return undefined;
if (err) {
reject(err);
} else if (!stream) {
reject(
new Error(
'Unexpeected error: no stream returned from Docker while pulling image',
),
);
} else {
stream.pipe(logStream, { end: false });
stream.on('end', () => resolve());
stream.on('error', (error: Error) => reject(error));
}
});
});
}
@@ -99,7 +107,7 @@ export class DockerContainerRunner implements ContainerRunner {
}
// Create docker environment variables array
const Env = [];
const Env = new Array<string>();
for (const [key, value] of Object.entries(envVars)) {
Env.push(`${key}=${value}`);
}
@@ -76,12 +76,17 @@ export class DockerContainerRunner {
this.dockerClient.pull(imageName, {}, (err, stream) => {
if (err) {
reject(err);
return;
} else if (!stream) {
reject(
new Error(
'Unexpeected error: no stream returned from Docker while pulling image',
),
);
} else {
pipeline(stream, logStream, { end: false })
.then(resolve)
.catch(reject);
}
pipeline(stream, logStream, { end: false })
.then(resolve)
.catch(reject);
});
});
}
@@ -112,7 +117,7 @@ export class DockerContainerRunner {
}
// Create docker environment variables array
const Env = [];
const Env = new Array<string>();
for (const [key, value] of Object.entries(envVars)) {
Env.push(`${key}=${value}`);
}