Skip to content

Commit 18c6a04

Browse files
committed
fix: circular dependency in docker service
1 parent ddaa9f1 commit 18c6a04

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

api/src/unraid-api/graph/resolvers/docker/docker-template-scanner.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
1+
import { Injectable, Logger } from '@nestjs/common';
22
import { Timeout } from '@nestjs/schedule';
33
import { readdir, readFile } from 'fs/promises';
44
import { join } from 'path';
@@ -28,7 +28,6 @@ export class DockerTemplateScannerService {
2828

2929
constructor(
3030
private readonly dockerConfigService: DockerConfigService,
31-
@Inject(forwardRef(() => DockerService))
3231
private readonly dockerService: DockerService
3332
) {}
3433

api/src/unraid-api/graph/resolvers/docker/docker.service.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import { CACHE_MANAGER } from '@nestjs/cache-manager';
2-
import {
3-
forwardRef,
4-
Inject,
5-
Injectable,
6-
Logger,
7-
OnApplicationBootstrap,
8-
OnModuleInit,
9-
} from '@nestjs/common';
2+
import { Inject, Injectable, Logger } from '@nestjs/common';
103
import { readFile } from 'fs/promises';
114

125
import { type Cache } from 'cache-manager';
@@ -18,7 +11,6 @@ import { catchHandlers } from '@app/core/utils/misc/catch-handlers.js';
1811
import { sleep } from '@app/core/utils/misc/sleep.js';
1912
import { getters } from '@app/store/index.js';
2013
import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
21-
import { DockerTemplateScannerService } from '@app/unraid-api/graph/resolvers/docker/docker-template-scanner.service.js';
2214
import {
2315
ContainerPortType,
2416
ContainerState,
@@ -37,7 +29,7 @@ interface NetworkListingOptions {
3729
}
3830

3931
@Injectable()
40-
export class DockerService implements OnApplicationBootstrap {
32+
export class DockerService {
4133
private client: Docker;
4234
private autoStarts: string[] = [];
4335
private readonly logger = new Logger(DockerService.name);
@@ -50,17 +42,11 @@ export class DockerService implements OnApplicationBootstrap {
5042
constructor(
5143
@Inject(CACHE_MANAGER) private cacheManager: Cache,
5244
private readonly dockerConfigService: DockerConfigService,
53-
@Inject(forwardRef(() => DockerTemplateScannerService))
54-
private readonly templateScannerService: DockerTemplateScannerService,
5545
private readonly notificationsService: NotificationsService
5646
) {
5747
this.client = this.getDockerClient();
5848
}
5949

60-
async onApplicationBootstrap() {
61-
await this.templateScannerService.bootstrapScan();
62-
}
63-
6450
public getDockerClient() {
6551
return new Docker({
6652
socketPath: '/var/run/docker.sock',

0 commit comments

Comments
 (0)