From d4f10a9af38ee58f89854e7405c5d74252cb8e4f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 23 Nov 2022 14:39:30 +0100 Subject: [PATCH] feat: custom/private docker registries --- .../migration.sql | 59 ++++++ apps/api/prisma/schema.prisma | 17 ++ apps/api/prisma/seed.js | 6 +- .../routes/api/v1/applications/handlers.ts | 3 +- .../src/routes/api/v1/settings/handlers.ts | 8 +- apps/ui/src/routes/settings/_Menu.svelte | 20 ++ apps/ui/src/routes/settings/docker.svelte | 191 ++++++++++++++++++ 7 files changed, 301 insertions(+), 3 deletions(-) create mode 100644 apps/api/prisma/migrations/20221123133429_docker_registries/migration.sql create mode 100644 apps/ui/src/routes/settings/docker.svelte diff --git a/apps/api/prisma/migrations/20221123133429_docker_registries/migration.sql b/apps/api/prisma/migrations/20221123133429_docker_registries/migration.sql new file mode 100644 index 000000000..abebc5514 --- /dev/null +++ b/apps/api/prisma/migrations/20221123133429_docker_registries/migration.sql @@ -0,0 +1,59 @@ +-- CreateTable +CREATE TABLE "DockerRegistry" ( + "id" TEXT NOT NULL PRIMARY KEY, + "name" TEXT NOT NULL, + "url" TEXT NOT NULL, + "username" TEXT, + "password" TEXT, + "isSystemWide" BOOLEAN NOT NULL DEFAULT false, + "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updatedAt" DATETIME NOT NULL, + "teamId" TEXT, + CONSTRAINT "DockerRegistry_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team" ("id") ON DELETE SET NULL ON UPDATE CASCADE +); + +-- RedefineTables +PRAGMA foreign_keys=OFF; +CREATE TABLE "new_Application" ( + "id" TEXT NOT NULL PRIMARY KEY, + "name" TEXT NOT NULL, + "fqdn" TEXT, + "repository" TEXT, + "configHash" TEXT, + "branch" TEXT, + "buildPack" TEXT, + "projectId" INTEGER, + "port" INTEGER, + "exposePort" INTEGER, + "installCommand" TEXT, + "buildCommand" TEXT, + "startCommand" TEXT, + "baseDirectory" TEXT, + "publishDirectory" TEXT, + "deploymentType" TEXT, + "phpModules" TEXT, + "pythonWSGI" TEXT, + "pythonModule" TEXT, + "pythonVariable" TEXT, + "dockerFileLocation" TEXT, + "denoMainFile" TEXT, + "denoOptions" TEXT, + "dockerComposeFile" TEXT, + "dockerComposeFileLocation" TEXT, + "dockerComposeConfiguration" TEXT, + "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updatedAt" DATETIME NOT NULL, + "destinationDockerId" TEXT, + "gitSourceId" TEXT, + "baseImage" TEXT, + "baseBuildImage" TEXT, + "dockerRegistryId" TEXT NOT NULL DEFAULT '0', + CONSTRAINT "Application_gitSourceId_fkey" FOREIGN KEY ("gitSourceId") REFERENCES "GitSource" ("id") ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT "Application_destinationDockerId_fkey" FOREIGN KEY ("destinationDockerId") REFERENCES "DestinationDocker" ("id") ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT "Application_dockerRegistryId_fkey" FOREIGN KEY ("dockerRegistryId") REFERENCES "DockerRegistry" ("id") ON DELETE RESTRICT ON UPDATE CASCADE +); +INSERT INTO "new_Application" ("baseBuildImage", "baseDirectory", "baseImage", "branch", "buildCommand", "buildPack", "configHash", "createdAt", "denoMainFile", "denoOptions", "deploymentType", "destinationDockerId", "dockerComposeConfiguration", "dockerComposeFile", "dockerComposeFileLocation", "dockerFileLocation", "exposePort", "fqdn", "gitSourceId", "id", "installCommand", "name", "phpModules", "port", "projectId", "publishDirectory", "pythonModule", "pythonVariable", "pythonWSGI", "repository", "startCommand", "updatedAt") SELECT "baseBuildImage", "baseDirectory", "baseImage", "branch", "buildCommand", "buildPack", "configHash", "createdAt", "denoMainFile", "denoOptions", "deploymentType", "destinationDockerId", "dockerComposeConfiguration", "dockerComposeFile", "dockerComposeFileLocation", "dockerFileLocation", "exposePort", "fqdn", "gitSourceId", "id", "installCommand", "name", "phpModules", "port", "projectId", "publishDirectory", "pythonModule", "pythonVariable", "pythonWSGI", "repository", "startCommand", "updatedAt" FROM "Application"; +DROP TABLE "Application"; +ALTER TABLE "new_Application" RENAME TO "Application"; +PRAGMA foreign_key_check; +PRAGMA foreign_keys=ON; diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index d7bcc3c93..ef843f694 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -80,6 +80,7 @@ model Team { service Service[] users User[] certificate Certificate[] + dockerRegistry DockerRegistry[] } model TeamInvitation { @@ -133,6 +134,8 @@ model Application { teams Team[] connectedDatabase ApplicationConnectedDatabase? previewApplication PreviewApplication[] + dockerRegistryId String @default("0") + dockerRegistry DockerRegistry @relation(fields: [dockerRegistryId], references: [id]) } model PreviewApplication { @@ -293,6 +296,20 @@ model SshKey { destinationDocker DestinationDocker[] } +model DockerRegistry { + id String @id @default(cuid()) + name String + url String + username String? + password String? + isSystemWide Boolean @default(false) + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + teamId String? + team Team? @relation(fields: [teamId], references: [id]) + application Application[] +} + model GitSource { id String @id @default(cuid()) name String diff --git a/apps/api/prisma/seed.js b/apps/api/prisma/seed.js index d1ff11fb3..dddbf3e28 100644 --- a/apps/api/prisma/seed.js +++ b/apps/api/prisma/seed.js @@ -23,7 +23,6 @@ async function main() { }, data: { isTraefikUsed: true, - proxyHash: null } }); } @@ -92,6 +91,11 @@ async function main() { } } } + // Add default docker registry (dockerhub) + const registries = await prisma.dockerRegistry.findMany() + if (registries.length === 0) { + await prisma.dockerRegistry.create({ data: { id: "0", name: 'Docker Hub', url: 'https://index.docker.io/v1/', isSystemWide: true } }) + } } main() .catch((e) => { diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index e166951a9..e5f4ad198 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -241,7 +241,8 @@ export async function getApplicationFromDB(id: string, teamId: string) { secrets: true, persistentStorage: true, connectedDatabase: true, - previewApplication: true + previewApplication: true, + dockerRegistry: true } }); if (!application) { diff --git a/apps/api/src/routes/api/v1/settings/handlers.ts b/apps/api/src/routes/api/v1/settings/handlers.ts index 4aa5905f0..e12e05a0e 100644 --- a/apps/api/src/routes/api/v1/settings/handlers.ts +++ b/apps/api/src/routes/api/v1/settings/handlers.ts @@ -11,6 +11,8 @@ export async function listAllSettings(request: FastifyRequest) { const teamId = request.user.teamId; const settings = await listSettings(); const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } }) + const publicRegistries = await prisma.dockerRegistry.findMany({ where: { isSystemWide: true } }) + const registries = await prisma.dockerRegistry.findMany({ where: { team: { id: teamId } } }) const unencryptedKeys = [] if (sshKeys.length > 0) { for (const key of sshKeys) { @@ -27,7 +29,11 @@ export async function listAllSettings(request: FastifyRequest) { return { settings, certificates: cns, - sshKeys: unencryptedKeys + sshKeys: unencryptedKeys, + registries: { + public: publicRegistries, + private: registries + } } } catch ({ status, message }) { return errorHandler({ status, message }) diff --git a/apps/ui/src/routes/settings/_Menu.svelte b/apps/ui/src/routes/settings/_Menu.svelte index 990485231..e30870f14 100644 --- a/apps/ui/src/routes/settings/_Menu.svelte +++ b/apps/ui/src/routes/settings/_Menu.svelte @@ -27,6 +27,26 @@ Coolify Settings + +
  • + + + + Docker Registries +
    • {/if}
  • Keys & Certificates diff --git a/apps/ui/src/routes/settings/docker.svelte b/apps/ui/src/routes/settings/docker.svelte new file mode 100644 index 000000000..00548f0a0 --- /dev/null +++ b/apps/ui/src/routes/settings/docker.svelte @@ -0,0 +1,191 @@ + + + + +
    +
    +
    Docker Registries
    + + +
    + +
    + + + + + + + + + + + + {#each publicRegistries as registry} + + + + + + + + + {/each} + {#each privateRegistries as registry} + + + + + + + + + {/each} + +
    NamePublicUsernamePasswordActions
    {registry.name}{(registry.isSystemWide && 'Yes') || 'No'}{registry.username ?? 'N/A'}{registry.password ?? 'N/A'} + {#if !registry.isSystemWide} + + {/if} +
    {registry.name}{(registry.isSystemWide && 'Yes') || 'No'}{registry.username ?? 'N/A'}{registry.password ?? 'N/A'} + {#if !registry.isSystemWide} + + {/if} +
    +
    +
    + +{#if isModalActive} + +
    +
    +

    Add a Docker Registry to Coolify

    +
    +
    + + + + + + + + +
    + + +
    + + +
    +
    +
    +
    +{/if}