diff --git a/packages/gitea/zarf.yaml b/packages/gitea/zarf.yaml index 82d5717fea..0a9227ba39 100644 --- a/packages/gitea/zarf.yaml +++ b/packages/gitea/zarf.yaml @@ -58,7 +58,7 @@ components: charts: - name: gitea releaseName: zarf-gitea - url: https://dl.gitea.io/charts + url: "###ZARF_PKG_TMPL_GITEA_HELM_REPO###" version: 10.1.1 namespace: zarf valuesFiles: diff --git a/packages/zarf-registry/zarf.yaml b/packages/zarf-registry/zarf.yaml index 65ef178ea2..2ca48d2a6b 100644 --- a/packages/zarf-registry/zarf.yaml +++ b/packages/zarf-registry/zarf.yaml @@ -111,7 +111,7 @@ components: architecture: amd64 files: # Rust Injector Binary - - source: https://zarf-init-resources.s3.us-east-1.amazonaws.com/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-amd64 + - source: https://###ZARF_PKG_TMPL_INJECTOR_DOMAIN###/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-amd64 target: "###ZARF_TEMP###/zarf-injector" shasum: "###ZARF_PKG_TMPL_INJECTOR_AMD64_SHASUM###" executable: true @@ -126,7 +126,7 @@ components: architecture: arm64 files: # Rust Injector Binary - - source: https://zarf-init-resources.s3.us-east-1.amazonaws.com/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-arm64 + - source: https://###ZARF_PKG_TMPL_INJECTOR_DOMAIN###/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-arm64 target: "###ZARF_TEMP###/zarf-injector" shasum: "###ZARF_PKG_TMPL_INJECTOR_ARM64_SHASUM###" executable: true diff --git a/site/src/content/docs/tutorials/7-custom-init-packages.mdx b/site/src/content/docs/tutorials/7-custom-init-packages.mdx index d49cc604d0..084b9e736a 100644 --- a/site/src/content/docs/tutorials/7-custom-init-packages.mdx +++ b/site/src/content/docs/tutorials/7-custom-init-packages.mdx @@ -92,6 +92,8 @@ $ zarf package create . \ --set REGISTRY_IMAGE="opensource/registry" \ --set REGISTRY_IMAGE_DOMAIN="custom.enterprise.corp" \ --set GITEA_IMAGE="custom.enterprise.corp/opensource/gitea:v1.21.0-rootless" +--set GITEA_HELM_REPO="custom.enterprise.corp/charts" +--set INJECTOR_DOMAIN="custom.enterprise.corp/s3-proxy" ``` ⚠️ - The Gitea image is different from the Agent and Registry in that Zarf will always prefer the `rootless` version of a given server image. The image no longer must be tagged with `-rootless`, but it still needs to implement the [Gitea configuration of a rootless image](https://github.com/go-gitea/gitea/blob/main/Dockerfile.rootless). If you need to change this, edit the `packages/gitea` package. diff --git a/zarf-config.toml b/zarf-config.toml index 2b326fe48a..5fdec81794 100644 --- a/zarf-config.toml +++ b/zarf-config.toml @@ -6,6 +6,7 @@ agent_image_tag = 'local' # Tag for the zarf injector binary to use injector_version = '2025-03-24' +injector_domain = 'zarf-init-resources.s3.us-east-1.amazonaws.com' injector_amd64_shasum = 'a78d66b9e2b00a22edd9b4e6432a4d934621e3757f09493b12f688c7c9baca93' injector_arm64_shasum = 'f68cf097ace34bdd04f6b1571a8d8ab4e04a27614dd7e752199ff09e21f4089b' @@ -17,3 +18,4 @@ registry_image_tag = '3.0.0' # The image reference to use for the optional git-server Zarf deploys gitea_image = 'gitea/gitea:1.21.5-rootless' +gitea_helm_repo = 'https://dl.gitea.io/charts'