From 67f2753cd760ee072b10a6e7aeec25d800df0c53 Mon Sep 17 00:00:00 2001 From: "Ivan.Makeev" Date: Fri, 20 Dec 2024 14:20:41 +0400 Subject: [PATCH] * make werf manifests compatible with other modules (like sds-replicated-volume) Signed-off-by: Ivan.Makeev --- .werf/consts.yaml | 2 +- images/agent/werf.inc.yaml | 2 +- images/sds-utils-installer/werf.inc.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.werf/consts.yaml b/.werf/consts.yaml index 65d3593c..45f969d6 100644 --- a/.werf/consts.yaml +++ b/.werf/consts.yaml @@ -1,6 +1,6 @@ # base images {{- $_ := set $ "BASE_ALPINE_DEV" "registry.deckhouse.io/base_images/dev-alpine:3.16.3@sha256:c706fa83cc129079e430480369a3f062b8178cac9ec89266ebab753a574aca8e" }} -{{- $_ := set $ "BASE_ALT_P11" "registry.deckhouse.io/base_images/alt:p11@sha256:c396cd7348a48f9236413e2ef5569223c15e554c0a3ca37f9d92fb787d4f1893" }} +{{- $_ := set $ "BASE_ALT_DEV" "registry.deckhouse.ru/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }} {{- $_ := set $ "BASE_GOLANG_1_22" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:e5dc67bf84590c008338a0e30f56a6ed2092a38e0d2895c797dd501db73a2330" }} {{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }} diff --git a/images/agent/werf.inc.yaml b/images/agent/werf.inc.yaml index 4089e0e4..a75c4d6f 100644 --- a/images/agent/werf.inc.yaml +++ b/images/agent/werf.inc.yaml @@ -1,7 +1,7 @@ {{ $binaries := "/opt/deckhouse/sds/lib/libblkid.so.1 /opt/deckhouse/sds/lib/libmount.so.1 /opt/deckhouse/sds/lib/libsmartcols.so.1 /opt/deckhouse/sds/bin/nsenter.static /opt/deckhouse/sds/lib/x86_64-linux-gnu/libudev.so.1 /opt/deckhouse/sds/lib/x86_64-linux-gnu/libcap.so.2 ld-linux-x86-64.so.2 /opt/deckhouse/sds/bin/lsblk.dynamic" }} --- image: {{ $.ImageName }}-binaries-artifact -from: {{ $.Root.BASE_ALT_P11 }} +from: {{ $.Root.BASE_ALT_DEV }} final: false shell: diff --git a/images/sds-utils-installer/werf.inc.yaml b/images/sds-utils-installer/werf.inc.yaml index c9560b48..264f518f 100644 --- a/images/sds-utils-installer/werf.inc.yaml +++ b/images/sds-utils-installer/werf.inc.yaml @@ -1,7 +1,7 @@ {{ $binaries := "/sds-utils/bin/lvm.static" }} --- image: {{ $.ImageName }}-binaries-artifact -from: {{ $.Root.BASE_ALT_P11 }} +from: {{ $.Root.BASE_ALT_DEV }} final: false shell: