diff --git a/sites/platform/config/_default/params.yaml b/sites/platform/config/_default/params.yaml index 760aeeda93..fefd442cbc 100644 --- a/sites/platform/config/_default/params.yaml +++ b/sites/platform/config/_default/params.yaml @@ -8,6 +8,7 @@ issuerepo: "https://github.com/platformsh/platformsh-docs/" repo: "https://github.com/platformsh/platformsh-docs/" folder: "sites/platform" editPageButton: true +registryBaseURL: "https://master-7rqtwti-b3ghjlg3f5nug.eu-5.platformsh.site/image" theme: use_vendor: true diff --git a/sites/upsun/config/_default/params.yaml b/sites/upsun/config/_default/params.yaml index 134efd26c3..a86bfa4a8d 100644 --- a/sites/upsun/config/_default/params.yaml +++ b/sites/upsun/config/_default/params.yaml @@ -8,6 +8,7 @@ issuerepo: "https://github.com/platformsh/platformsh-docs/" repo: "https://github.com/platformsh/platformsh-docs/" folder: "sites/upsun" editPageButton: true +registryBaseURL: "https://master-7rqtwti-b3ghjlg3f5nug.eu-5.platformsh.site/image" theme: use_vendor: true diff --git a/sites/upsun/src/add-services/redis.md b/sites/upsun/src/add-services/redis.md index 89f13fe990..a9a7d6f205 100644 --- a/sites/upsun/src/add-services/redis.md +++ b/sites/upsun/src/add-services/redis.md @@ -114,6 +114,7 @@ export APP_REDIS_HOST="$(echo "$RELATIONSHIPS_JSON" | jq -r '.redis[0].host')" The format of the relationship is identical whether your Redis service is [ephemeral](#ephemeral-redis) or [persistent](#persistent-redis). + ## Persistent Redis By default, Redis is an ephemeral service that stores data in memory. diff --git a/sites/upsun/src/add-services/valkey.md b/sites/upsun/src/add-services/valkey.md index 8ef3674d61..4a7e6c976d 100644 --- a/sites/upsun/src/add-services/valkey.md +++ b/sites/upsun/src/add-services/valkey.md @@ -19,14 +19,6 @@ Patch versions are applied periodically for bug fixes and the like. When you dep {{< image-versions image="valkey" status="supported" environment="grid" >}} - - ## Service types Depending on your needs, you can set up Valkey as [persistent](#persistent-valkey) or [ephemeral](#ephemeral-valkey). diff --git a/themes/psh-docs/layouts/shortcodes/image-versions.html b/themes/psh-docs/layouts/shortcodes/image-versions.html index 5d6e4536eb..ae562c44af 100644 --- a/themes/psh-docs/layouts/shortcodes/image-versions.html +++ b/themes/psh-docs/layouts/shortcodes/image-versions.html @@ -13,22 +13,23 @@ {{ errorf "Incorrect environment param: %q. Possible values are grid, dedicated-gen-2, and dedicated-gen-3. Empty defaults to \"grid\". Image: %s" $envParam $image }} {{ end }} -{{ if (index .Site.Data.registry $image $environment) }} - {{ if isset (index .Site.Data.registry $image $environment) $status }} - {{ if gt ( len ( index .Site.Data.registry $image $environment $status ) ) 0 }} - - {{ else if ne $status "deprecated" }} - None available - {{ end }} +{{- $baseURL := .Site.Params.registryBaseURL -}} +{{- $url := printf "%s/%s?items=versions" $baseURL $image -}} +{{- $remote := resources.GetRemote $url -}} + +{{- $data := $remote.Content | transform.Unmarshal | default dict -}} +{{- $versions := $data.versions | default dict -}} + +{{ if index $versions $status }} + {{ if gt (len (index $versions $status)) 0 }} + + {{ else if ne $status "deprecated" }} + None {{ end }} {{ else }} - {{ if and (eq $envParam "dedicated") (eq $status "supported") }} - None available - {{ else }} - None available - {{ end }} + None {{ end }} diff --git a/themes/psh-docs/layouts/shortcodes/latest.html b/themes/psh-docs/layouts/shortcodes/latest.html index cab12aa7f5..5ad04683a9 100644 --- a/themes/psh-docs/layouts/shortcodes/latest.html +++ b/themes/psh-docs/layouts/shortcodes/latest.html @@ -1,4 +1,18 @@ {{- $arg := .Get 0 -}} -{{- $data := cond (eq $arg "composable") .Site.Data.composable_versions .Site.Data.registry -}} -{{- $supported := index $data $arg "versions" "supported" -}} -{{- index $supported 0 -}} +{{- $baseURL := .Site.Params.registryBaseURL -}} + +{{- if eq $arg "composable" -}} + {{- $data := .Site.Data.composable_versions -}} + {{- $supported := index $data $arg "versions" "supported" -}} + {{- index $supported 0 | default "n/a" -}} +{{- else -}} + {{- $url := printf "%s/%s?items=versions,supported" $baseURL $arg -}} + {{- $remote := resources.GetRemote $url -}} + {{- if and $remote $remote.Content -}} + {{- $data := $remote.Content | transform.Unmarshal | default dict -}} + {{- $supported := $data.versions.supported | default slice -}} + {{- index $supported 0 | default "n/a" -}} + {{- else -}} + n/a + {{- end -}} +{{- end -}} diff --git a/themes/psh-docs/layouts/shortcodes/supported-services.md b/themes/psh-docs/layouts/shortcodes/supported-services.md index 495f2efcce..322020255d 100644 --- a/themes/psh-docs/layouts/shortcodes/supported-services.md +++ b/themes/psh-docs/layouts/shortcodes/supported-services.md @@ -1,7 +1,17 @@ -{{ $registry := .Site.Data.registry }} +{{ $baseURL := .Site.Params.registryBaseURL }} +{{- $remote := resources.GetRemote $baseURL -}} +{{- $registry := dict -}} + +{{- if and $remote $remote.Content -}} + {{- $registry = $remote.Content | transform.Unmarshal | default dict -}} | Service | `type` | Supported versions | -| ------- | ------ | ------------------ |{{ range sort $registry "type" }}{{ if eq .runtime false }} -| [{{ .name }}]({{ .docs.url }}){{ if .premium }} {{ partial "premium-features/badge" }}{{ end }} | `{{ .type }}` | {{ delimit .versions.supported ", " }} |{{ end }}{{ end }} +| ------- | ------ | ------------------ | +{{- range sort $registry "type" }} +{{- if eq .runtime false }} +| [{{ .name }}]({{ .docs.url }}){{ if .premium }} {{ partial "premium-features/badge" }}{{ end }} | `{{ .type }}` | {{ delimit .versions.supported ", " }} | +{{- end }} +{{- end }} +{{- end -}}