Fix/default registry (#876)

* fix: default registry tricked many people * fix: stuck state detection
gimlet-io · Oct 6, 2024 · bfff2fd · bfff2fd
1 parent 6e4d9d1
commit bfff2fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/web/src/components/nav/nav.jsx b/web/src/components/nav/nav.jsx
@@ -437,7 +437,7 @@ function Connecting(props) {
     )
   }
 
-  const age = new Date() - expiringAt
+  const age = new Date() - (expiringAt-sevenDays)
   const stuck = age > 5*60*1000
   if (stuck) {
     return (

diff --git a/web/src/views/envConfig/imageWidget.jsx b/web/src/views/envConfig/imageWidget.jsx
@@ -26,12 +26,18 @@ export default function ImageWidget(props) {
   }
 
   const setStrategy = (strategy) => {
+    let registry = {}
+    registry = registries.find(r => r.variable === "customRegistry")
+    if (!registry) {
+      registry = registries.find(r => r.variable === "containerizedRegistry")
+    }
+
     switch (strategy) {
       case 'dynamic':
         setImage({
           ...image,
           "strategy": strategy,
-          "registry": "public",
+          "registry": "",
           "repository": "your-company/your-repo",
           "tag": "{{ .SHA }}",
           "dockerfile": ""
@@ -41,8 +47,8 @@ export default function ImageWidget(props) {
         setImage({
           ...image,
           "strategy": strategy,
-          "registry": "containerizedRegistry",
-          "repository": "127.0.0.1:32447/{{ .APP }}",
+          "registry": registry.variable,
+          "repository": registry.url+"/{{ .APP }}",
           "tag": "{{ .SHA }}",
           "dockerfile": "Dockerfile"
         })
@@ -51,8 +57,8 @@ export default function ImageWidget(props) {
         setImage({
           ...image,
           "strategy": strategy,
-          "registry": "containerizedRegistry",
-          "repository": "127.0.0.1:32447/{{ .APP }}",
+          "registry": registry.variable,
+          "repository": registry.url+"/{{ .APP }}",
           "tag": "{{ .SHA }}",
           "dockerfile": ""
         })