Merge pull request #129 from nrwl/steve/chore/fix-image-defaults

chore(app): ensure most specific image spec values have priority
nrwl · Aug 20, 2024 · 4aefce1 · 4aefce1
2 parents d16e27c + 1f5eb86
commit 4aefce1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/charts/nx-cloud/Chart.yaml b/charts/nx-cloud/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-cloud
 description: Nx Cloud Helm Chart
 type: application
-version: 0.15.7
+version: 0.15.8
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-cloud/templates/_images.yml b/charts/nx-cloud/templates/_images.yml
@@ -6,13 +6,13 @@ and modified to support global imageTag
 */}}
 {{- define "nxCloud.images.common" }}
 {{- $registryName := .imageRoot.registry }}
-{{- $repositoryName := default .imageRoot.repository .global.imageRepository }}
+{{- $repositoryName := default .global.imageRepository .imageRoot.repository }}
 {{- $imageName := .imageRoot.imageName }}
 {{- $separator := ":" }}
 {{- $termination := default .image.tag (default .global.imageTag .imageRoot.tag) | toString }}
 {{- if .global }}
     {{- if .global.imageRegistry }}
-     {{- $registryName = .global.imageRegistry }}
+     {{- $registryName = default .global.imageRegistry $registryName }}
     {{- end }}
 {{- end }}
 {{- if .imageRoot.digest }}