fix: container name defaults

web/crux-ui/src/models/image.ts

@@ -78,4 +78,13 @@ export type ImageMessage = VersionImage
 
 export const imageNameOf = (image: VersionImage): string => imageName(image.name, image.tag)
 
-export const containerNameOfImage = (image: VersionImage) => image.config.name ?? image.name
+export const registryImageNameToContainerName = (name: string) => {
+  if (name.includes('/')) {
+    return name.split('/').pop()
+  }
+
+  return name
+}
+
+export const containerNameOfImage = (image: VersionImage) =>
+  image.config.name ?? registryImageNameToContainerName(image.name)

web/crux/src/domain/container.ts

@@ -1,4 +1,5 @@
 import { NetworkMode } from '@prisma/client'
+import { registryImageNameToContainerName } from './image'
 
 export const PORT_MIN = 0
 export const PORT_MAX = 65535
@@ -278,4 +279,4 @@ type InstanceWithConfigAndImageConfig = {
 }
 
 export const nameOfInstance = (instance: InstanceWithConfigAndImageConfig) =>
-  instance.config.name ?? instance.image.config.name ?? instance.image.name
+  instance.config.name ?? instance.image.config.name ?? registryImageNameToContainerName(instance.image.name)

web/crux/src/domain/image.ts

@@ -76,3 +76,11 @@ export const parseDyrectorioEnvRules = (labels: Record<string, string>): Record<
     }
   }, {})
 }
+
+export const registryImageNameToContainerName = (name: string) => {
+  if (name.includes('/')) {
+    return name.split('/').pop()
+  }
+
+  return name
+}

web/crux/src/domain/start-deployment.ts

@@ -1,5 +1,5 @@
 import { ContainerConfig, DeploymentStatusEnum, VersionTypeEnum } from '@prisma/client'
-import { ConcreteContainerConfigData, ContainerConfigData, UniqueSecretKeyValue } from './container'
+import { ConcreteContainerConfigData, ContainerConfigData, UniqueSecretKeyValue, nameOfInstance } from './container'
 import { mergeConfigsWithConcreteConfig, mergeInstanceConfigWithDeploymentConfig } from './container-merge'
 import { DeploymentWithConfig } from './deployment'
 
@@ -122,11 +122,11 @@ export const instanceConfigOf = (
 
   // then we merge and override the rest with the instance config
   const instanceConfig = instance.config as any as ConcreteContainerConfigData
-  const result =  mergeInstanceConfigWithDeploymentConfig(mergedDeploymentConfig, instanceConfig)
+  const result = mergeInstanceConfigWithDeploymentConfig(mergedDeploymentConfig, instanceConfig)
 
   // set defaults
   if (!result.name) {
-    result.name = instance.image.name
+    result.name = nameOfInstance(instance)
   }
 
   return result