chore: update alpine image

Signed-off-by: Nikita korolev <nikita.korolev@flant.com>
deckhouse · Sep 18, 2024 · c2dcc05 · c2dcc05
1 parent 7cd22f1
commit c2dcc05
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/base-images/image_versions.yml b/base-images/image_versions.yml
@@ -2,10 +2,10 @@
 REGISTRY_PATH: "docker.io/"
 
 # Virtualization images
-BASE_DEBIAN_BOOKWORM_SLIM: "debian:bookworm-slim@sha256:050f00e86cc4d928b21de66096126fac52c2ea47885c232932b2e4c00f0c116d"
+BASE_DEBIAN_BOOKWORM_SLIM: "debian:bookworm-slim@sha256:a629e796d77a7b2ff82186ed15d01a493801c020eed5ce6adaa2704356f15a1c"
 BASE_CONTAINER_REGISTRY: "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90"
 BASE_GOLANG_22_BOOKWORM: "golang:1.22.7-bookworm@sha256:027bd04b1d3b4529bf8ccebf62eb7eeeae7b7bef134a68bd419824e929ad93ad"
 
 BASE_ALT_P10: "alt:p10@sha256:4fab03b8d23eb16147397b0bc41a5025ba59f4e834f7fb4b933ac5206431d740"
 BASE_ALT_P11: "alt:p11@sha256:098a43278e5181b9732697100ea39520d509e30996c0b9fad15e5acb58ea478a"
-BASE_ALPINE: "alpine:3.17@sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc"
+BASE_ALPINE: "alpine:3.17.10@sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a"
diff --git a/images/virtualization-artifact/werf.inc.yaml b/images/virtualization-artifact/werf.inc.yaml
@@ -1,15 +1,7 @@
 ---
 image: {{ $.ImageName }}
-<<<<<<< HEAD
-<<<<<<< HEAD
 final: false
-from: {{ .Images.BASE_GOLANG_21_BOOKWORM }}
-=======
-=======
-final: false
->>>>>>> 6bbff7bf (chore: rm virtualization-artifact from digest.json)
 from: {{ .Images.BASE_GOLANG_22_BOOKWORM }}
->>>>>>> cde693eb (chore(module): virtualization-artifact, update image to BASE_GOLANG_22_BOOKWORM)
 git:
 - add: /api
   to: /usr/local/go/api

diff --git a/werf.yaml b/werf.yaml
@@ -58,23 +58,14 @@ dockerfile: Dockerfile
 
   {{- include "module_image_template" $ctx }}
   {{- range $ImageYamlMainfest := regexSplit "\n?---[ \t]*\n" (include "module_image_template" $ctx) -1 }}
-
     {{- $ImageManifest := $ImageYamlMainfest | fromYaml }}
     {{- if $ImageManifest | dig "final" true }}
-<<<<<<< HEAD
       {{- if $ImageManifest.image }}
         {{- $ImagesIDList = append $ImagesIDList $ImageManifest.image }}
       {{- end }}
-=======
-
-    {{- if $ImageManifest.image }}
-      {{- $ImagesIDList = append $ImagesIDList $ImageManifest.image }}
->>>>>>> 1ea361b1 (chore(ci): test final:false werf.yaml)
     {{- end }}
     {{- end }}
-
   {{- end }}
-{{- end }}
 ---
 image: images-digests
 from: {{ .Images.BASE_ALPINE }}