Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(multi-server): update path imports

Browse Source
This commit is contained in:
Mauricio Siu
2024-09-29 18:04:45 -06:00
parent 2ae7e562bb
commit 7bd6b66551
115 changed files with 186 additions and 7124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dokploy/__test__/compose/compose.test.ts
View File

@@ -1,5 +1,5 @@
import { addSuffixToAllProperties } from "@/server/utils/docker/compose";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { addSuffixToAllProperties } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/config/config-root.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToConfigsRoot } from "@/server/utils/docker/compose/configs";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToConfigsRoot } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/config/config-service.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToConfigsInServices } from "@/server/utils/docker/compose/configs";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToConfigsInServices } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/config/config.test.ts
View File

@@ -1,9 +1,9 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { generateRandomHash } from "@dokploy/builders";
import {
addSuffixToAllConfigs,
addSuffixToConfigsRoot,
} from "@/server/utils/docker/compose/configs";
import type { ComposeSpecification } from "@/server/utils/docker/types";
} from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

4
apps/dokploy/__test__/compose/domain/labels.test.ts
View File

@@ -1,5 +1,5 @@
import type { Domain } from "@/server/api/services/domain";
import { createDomainLabels } from "@/server/utils/docker/domain";
import type { Domain } from "@dokploy/builders";
import { createDomainLabels } from "@dokploy/builders";
import { describe, expect, it } from "vitest";
describe("createDomainLabels", () => {

2
apps/dokploy/__test__/compose/domain/network-root.test.ts
View File

@@ -1,4 +1,4 @@
import { addDokployNetworkToRoot } from "@/server/utils/docker/domain";
import { addDokployNetworkToRoot } from "@dokploy/builders";
import { describe, expect, it } from "vitest";
describe("addDokployNetworkToRoot", () => {

2
apps/dokploy/__test__/compose/domain/network-service.test.ts
View File

@@ -1,4 +1,4 @@
import { addDokployNetworkToService } from "@/server/utils/docker/domain";
import { addDokployNetworkToService } from "@dokploy/builders";
import { describe, expect, it } from "vitest";
describe("addDokployNetworkToService", () => {

6
apps/dokploy/__test__/compose/network/network-root.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToNetworksRoot } from "@/server/utils/docker/compose/network";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToNetworksRoot } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/network/network-service.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNetworks } from "@/server/utils/docker/compose/network";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNetworks } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

8
apps/dokploy/__test__/compose/network/network.test.ts
View File

@@ -1,10 +1,10 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { generateRandomHash } from "@dokploy/builders";
import {
addSuffixToAllNetworks,
addSuffixToServiceNetworks,
} from "@/server/utils/docker/compose/network";
import { addSuffixToNetworksRoot } from "@/server/utils/docker/compose/network";
import type { ComposeSpecification } from "@/server/utils/docker/types";
} from "@dokploy/builders";
import { addSuffixToNetworksRoot } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/secrets/secret-root.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToSecretsRoot } from "@/server/utils/docker/compose/secrets";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToSecretsRoot } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { dump, load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/secrets/secret-services.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToSecretsInServices } from "@/server/utils/docker/compose/secrets";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToSecretsInServices } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

4
apps/dokploy/__test__/compose/secrets/secret.test.ts
View File

@@ -1,5 +1,5 @@
import { addSuffixToAllSecrets } from "@/server/utils/docker/compose/secrets";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { addSuffixToAllSecrets } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/service-container-name.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/service-depends-on.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/service-extends.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/service-links.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/service-names.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

4
apps/dokploy/__test__/compose/service/service.test.ts
View File

@@ -1,8 +1,8 @@
import {
addSuffixToAllServiceNames,
addSuffixToServiceNames,
} from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
} from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToServiceNames } from "@/server/utils/docker/compose/service";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToServiceNames } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/volume/volume-2.test.ts
View File

@@ -1,9 +1,9 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { generateRandomHash } from "@dokploy/builders";
import {
addSuffixToAllVolumes,
addSuffixToVolumesRoot,
} from "@/server/utils/docker/compose/volume";
import type { ComposeSpecification } from "@/server/utils/docker/types";
} from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/volume/volume-root.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToVolumesRoot } from "@/server/utils/docker/compose/volume";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToVolumesRoot } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/volume/volume-services.test.ts
View File

@@ -1,6 +1,6 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { addSuffixToVolumesInServices } from "@/server/utils/docker/compose/volume";
import type { ComposeSpecification } from "@/server/utils/docker/types";
import { generateRandomHash } from "@dokploy/builders";
import { addSuffixToVolumesInServices } from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

6
apps/dokploy/__test__/compose/volume/volume.test.ts
View File

@@ -1,9 +1,9 @@
import { generateRandomHash } from "@/server/utils/docker/compose";
import { generateRandomHash } from "@dokploy/builders";
import {
addSuffixToAllVolumes,
addSuffixToVolumesInServices,
} from "@/server/utils/docker/compose/volume";
import type { ComposeSpecification } from "@/server/utils/docker/types";
} from "@dokploy/builders";
import type { ComposeSpecification } from "@dokploy/builders";
import { load } from "js-yaml";
import { expect, test } from "vitest";

4
apps/dokploy/__test__/drop/drop.test.test.ts
View File

@@ -2,8 +2,8 @@ import fs from "node:fs/promises";
import path from "node:path";
import { paths } from "@/server/constants";
const { APPLICATIONS_PATH } = paths();
import type { ApplicationNested } from "@/server/utils/builders";
import { unzipDrop } from "@/server/utils/builders/drop";
import type { ApplicationNested } from "@dokploy/builders";
import { unzipDrop } from "@dokploy/builders";
import AdmZip from "adm-zip";
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";

2
apps/dokploy/__test__/requests/request.test.ts
View File

@@ -1,4 +1,4 @@
import { parseRawConfig, processLogs } from "@/server/utils/access-log/utils";
import { parseRawConfig, processLogs } from "@dokploy/builders";
import { describe, expect, it } from "vitest";
const sampleLogEntry = `{"ClientAddr":"172.19.0.1:56732","ClientHost":"172.19.0.1","ClientPort":"56732","ClientUsername":"-","DownstreamContentSize":0,"DownstreamStatus":304,"Duration":14729375,"OriginContentSize":0,"OriginDuration":14051833,"OriginStatus":304,"Overhead":677542,"RequestAddr":"s222-umami-c381af.traefik.me","RequestContentSize":0,"RequestCount":122,"RequestHost":"s222-umami-c381af.traefik.me","RequestMethod":"GET","RequestPath":"/dashboard?_rsc=1rugv","RequestPort":"-","RequestProtocol":"HTTP/1.1","RequestScheme":"http","RetryAttempts":0,"RouterName":"s222-umami-60e104-47-web@docker","ServiceAddr":"10.0.1.15:3000","ServiceName":"s222-umami-60e104-47-web@docker","ServiceURL":{"Scheme":"http","Opaque":"","User":null,"Host":"10.0.1.15:3000","Path":"","RawPath":"","ForceQuery":false,"RawQuery":"","Fragment":"","RawFragment":""},"StartLocal":"2024-08-25T04:34:37.306691884Z","StartUTC":"2024-08-25T04:34:37.306691884Z","entryPointName":"web","level":"info","msg":"","time":"2024-08-25T04:34:37Z"}`;

11
apps/dokploy/__test__/traefik/server/update-server-config.test.ts
View File

@@ -5,11 +5,12 @@ vi.mock("node:fs", () => ({
default: fs,
}));
import type { Admin } from "@/server/api/services/admin";
import { createDefaultServerTraefikConfig } from "@/server/setup/traefik-setup";
import { loadOrCreateConfig } from "@/server/utils/traefik/application";
import type { FileConfig } from "@/server/utils/traefik/file-types";
import { updateServerTraefik } from "@/server/utils/traefik/web-server";
import type { Admin, FileConfig } from "@dokploy/builders";
import {
createDefaultServerTraefikConfig,
loadOrCreateConfig,
updateServerTraefik,
} from "@dokploy/builders";
import { beforeEach, expect, test, vi } from "vitest";
const baseAdmin: Admin = {

8
apps/dokploy/__test__/traefik/traefik.test.ts
View File

@@ -1,7 +1,7 @@
import type { Domain } from "@/server/api/services/domain";
import type { Redirect } from "@/server/api/services/redirect";
import type { ApplicationNested } from "@/server/utils/builders";
import { createRouterConfig } from "@/server/utils/traefik/domain";
import type { Domain } from "@dokploy/builders";
import type { Redirect } from "@dokploy/builders";
import type { ApplicationNested } from "@dokploy/builders";
import { createRouterConfig } from "@dokploy/builders";
import { expect, test } from "vitest";
const baseApp: ApplicationNested = {