diff --git a/images/bounder/werf.inc.yaml b/images/bounder/werf.inc.yaml index 86b1dfa77c..77b5556068 100644 --- a/images/bounder/werf.inc.yaml +++ b/images/bounder/werf.inc.yaml @@ -12,7 +12,7 @@ imageSpec: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.24" "builder/golang-alt-svace-1.24" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.24" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }}/static_binaries to: /static_binaries diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml index 4fb2dafa7b..c59bb56a47 100644 --- a/images/cdi-artifact/werf.inc.yaml +++ b/images/cdi-artifact/werf.inc.yaml @@ -47,7 +47,7 @@ shell: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-1.25" }} mount: {{- include "mount points for golang builds" . }} secrets: @@ -140,7 +140,7 @@ shell: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }} to: / diff --git a/images/cdi-cloner/werf.inc.yaml b/images/cdi-cloner/werf.inc.yaml index 569a84fe21..891674f4b6 100644 --- a/images/cdi-cloner/werf.inc.yaml +++ b/images/cdi-cloner/werf.inc.yaml @@ -53,7 +53,7 @@ shell: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuild final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }}/cloner-startup to: /app diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml index 754215300f..c179c240a9 100644 --- a/images/dvcr-artifact/werf.inc.yaml +++ b/images/dvcr-artifact/werf.inc.yaml @@ -23,7 +23,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-1.25" }} secrets: - id: GOPROXY value: {{ .GOPROXY }} diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml index 145bb08692..a80724e9fc 100644 --- a/images/dvcr/werf.inc.yaml +++ b/images/dvcr/werf.inc.yaml @@ -40,7 +40,7 @@ imageSpec: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} mount: {{- include "mount points for golang builds" . }} import: diff --git a/images/hooks/werf.inc.yaml b/images/hooks/werf.inc.yaml index afe9a59b4a..77907dc40b 100644 --- a/images/hooks/werf.inc.yaml +++ b/images/hooks/werf.inc.yaml @@ -24,7 +24,7 @@ shell: --- image: {{ .ModuleNamePrefix }}go-hooks-artifact final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src diff --git a/images/kube-api-rewriter/werf.inc.yaml b/images/kube-api-rewriter/werf.inc.yaml index 6728fe4dbd..26241540d1 100644 --- a/images/kube-api-rewriter/werf.inc.yaml +++ b/images/kube-api-rewriter/werf.inc.yaml @@ -20,7 +20,7 @@ git: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src diff --git a/images/packages/libvirt/werf.inc.yaml b/images/packages/libvirt/werf.inc.yaml index c34266475c..b74e6eb8f8 100644 --- a/images/packages/libvirt/werf.inc.yaml +++ b/images/packages/libvirt/werf.inc.yaml @@ -110,7 +110,7 @@ packages: {{ $builderDependencies := include "$name" . | fromYaml }} image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false -fromImage: {{ eq .SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24" }} +fromImage: {{ eq .SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src/{{ $gitRepoName }}-{{ $version }} diff --git a/images/packages/swtpm/werf.inc.yaml b/images/packages/swtpm/werf.inc.yaml index 72a22c824e..cdf9173046 100644 --- a/images/packages/swtpm/werf.inc.yaml +++ b/images/packages/swtpm/werf.inc.yaml @@ -50,7 +50,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact add: /src diff --git a/images/pre-delete-hook/werf.inc.yaml b/images/pre-delete-hook/werf.inc.yaml index 57c87255a0..1c7a853fed 100644 --- a/images/pre-delete-hook/werf.inc.yaml +++ b/images/pre-delete-hook/werf.inc.yaml @@ -13,7 +13,7 @@ git: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index fd46e099e5..f027292e1a 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -148,7 +148,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src/{{ $gitRepoName }}-{{ $version }} diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 542d241165..0d75ebb629 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -43,7 +43,7 @@ packages: image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-1.25" }} mount: {{- include "mount points for golang builds" . }} secrets: diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 8773fab73a..e86f52acf3 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -403,7 +403,7 @@ shell: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuilder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-alt-1.25" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }}/node-labeller to: /node-labeller @@ -455,7 +455,7 @@ shell: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }}/static_binaries to: /static_binaries diff --git a/images/virtualization-artifact/werf.inc.yaml b/images/virtualization-artifact/werf.inc.yaml index 207866cba8..6f081186c6 100644 --- a/images/virtualization-artifact/werf.inc.yaml +++ b/images/virtualization-artifact/werf.inc.yaml @@ -22,7 +22,7 @@ git: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }} final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src diff --git a/images/virtualization-dra/werf.inc.yaml b/images/virtualization-dra/werf.inc.yaml index 4b35ca0705..f512cfc579 100644 --- a/images/virtualization-dra/werf.inc.yaml +++ b/images/virtualization-dra/werf.inc.yaml @@ -1,7 +1,7 @@ --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} git: - add: {{ .ModuleDir }}/images/{{ .ImageName }} to: /src/images/virtualization-dra diff --git a/images/vm-route-forge/werf.inc.yaml b/images/vm-route-forge/werf.inc.yaml index 9ffea2204b..eba7474179 100644 --- a/images/vm-route-forge/werf.inc.yaml +++ b/images/vm-route-forge/werf.inc.yaml @@ -18,7 +18,7 @@ git: --- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder final: false -fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-svace-1.25" }} +fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-debian-1.25" "builder/golang-alt-1.25" }} import: - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact add: /src