Merge pull request #13577 from matteosilv/master

fixing techdocs-cli Docker client creation
This commit is contained in:
Eric Peterson
2022-09-27 12:00:16 +02:00
committed by GitHub
6 changed files with 51 additions and 8 deletions
+2 -2
View File
@@ -42,7 +42,7 @@ export type GeneratorBuilder = {
// @public
export type GeneratorOptions = {
containerRunner: ContainerRunner;
containerRunner?: ContainerRunner;
logger: Logger;
};
@@ -213,7 +213,7 @@ export interface TechDocsDocument extends IndexableDocument {
export class TechdocsGenerator implements GeneratorBase {
constructor(options: {
logger: Logger;
containerRunner: ContainerRunner;
containerRunner?: ContainerRunner;
config: Config;
scmIntegrations: ScmIntegrationRegistry;
});
@@ -55,7 +55,7 @@ export class TechdocsGenerator implements GeneratorBase {
*/
public static readonly defaultDockerImage = 'spotify/techdocs:v1.1.0';
private readonly logger: Logger;
private readonly containerRunner: ContainerRunner;
private readonly containerRunner?: ContainerRunner;
private readonly options: GeneratorConfig;
private readonly scmIntegrations: ScmIntegrationRegistry;
@@ -77,7 +77,7 @@ export class TechdocsGenerator implements GeneratorBase {
constructor(options: {
logger: Logger;
containerRunner: ContainerRunner;
containerRunner?: ContainerRunner;
config: Config;
scmIntegrations: ScmIntegrationRegistry;
}) {
@@ -143,6 +143,11 @@ export class TechdocsGenerator implements GeneratorBase {
);
break;
case 'docker':
if (this.containerRunner === undefined) {
throw new Error(
"Invalid state: containerRunner cannot be undefined when runIn is 'docker'",
);
}
await this.containerRunner.runContainer({
imageName:
this.options.dockerImage ?? TechdocsGenerator.defaultDockerImage,
@@ -28,7 +28,7 @@ export type GeneratorRunInType = 'docker' | 'local';
* @public
*/
export type GeneratorOptions = {
containerRunner: ContainerRunner;
containerRunner?: ContainerRunner;
logger: Logger;
};