From d19dec801033ed6e173780ae3051829c414b707a Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Mon, 13 May 2024 03:15:09 -0600 Subject: [PATCH] refactor: set the registry url in image in case we have a registry asociated --- .../settings/cluster/worker/show-workers.tsx | 2 +- pages/_error.tsx | 4 ++-- server/api/routers/registry.ts | 1 + server/api/routers/settings.ts | 1 + server/utils/builders/index.ts | 17 ++++++++++++++++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/components/dashboard/settings/cluster/worker/show-workers.tsx b/components/dashboard/settings/cluster/worker/show-workers.tsx index bb0deb8f..470ab86d 100644 --- a/components/dashboard/settings/cluster/worker/show-workers.tsx +++ b/components/dashboard/settings/cluster/worker/show-workers.tsx @@ -41,7 +41,7 @@ export const ShowCluster = () => { {worker.Spec.Availability} - {worker.ManagerStatus.Reachability} + {worker?.ManagerStatus?.Reachability || "-"} {worker?.Spec?.Role} diff --git a/pages/_error.tsx b/pages/_error.tsx index fb3bf23c..4939d018 100644 --- a/pages/_error.tsx +++ b/pages/_error.tsx @@ -12,8 +12,8 @@ export default function Custom404({ statusCode }: Props) {
-
-

+
+

{statusCode ? `An error ${statusCode} occurred on server` : "An error occurred on client"} diff --git a/server/api/routers/registry.ts b/server/api/routers/registry.ts index 0fe09776..4779b948 100644 --- a/server/api/routers/registry.ts +++ b/server/api/routers/registry.ts @@ -64,6 +64,7 @@ export const registryRouter = createTRPCRouter({ return true; } catch (error) { + console.log(error); return false; } }), diff --git a/server/api/routers/settings.ts b/server/api/routers/settings.ts index 366530d8..dabb3308 100644 --- a/server/api/routers/settings.ts +++ b/server/api/routers/settings.ts @@ -238,3 +238,4 @@ export const settingsRouter = createTRPCRouter({ return readConfigInPath(input.path); }), }); +// apt-get install apache2-utils diff --git a/server/utils/builders/index.ts b/server/utils/builders/index.ts index 73ba8fd8..d2611e2b 100644 --- a/server/utils/builders/index.ts +++ b/server/utils/builders/index.ts @@ -81,16 +81,31 @@ export const mechanizeDockerContainer = async ( cpuLimit, cpuReservation, }); + const volumesMount = generateVolumeMounts(mounts); const bindsMount = generateBindMounts(mounts); const filesMount = generateFileMounts(appName, mounts); const envVariables = prepareEnvironmentVariables(env); + const registry = application.registry; + + const image = + sourceType === "docker" + ? dockerImage! + : registry + ? `${registry.registryUrl}/${appName}` + : `${appName}:latest`; + const settings: CreateServiceOptions = { + authconfig: { + password: registry?.password || "", + username: registry?.username || "", + serveraddress: registry?.registryUrl || "", + }, Name: appName, TaskTemplate: { ContainerSpec: { - Image: sourceType === "docker" ? dockerImage! : `${appName}:latest`, + Image: image, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], ...(command