Skip to content

Commit 1f469d0

Browse files
authored
[ci] Remove artifact directive from image build (#25)
Signed-off-by: v.oleynikov <[email protected]>
1 parent 7713c56 commit 1f469d0

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

images/controller/werf.inc.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
{{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }}
33

44
---
5-
artifact: {{ $.ImageName }}-golang-artifact
5+
image: {{ $.ImageName }}-golang-artifact
66
from: {{ $.BASE_GOLANG_22_ALPINE }}
7+
final: false
78

89
git:
910
- add: /images/controller/src
@@ -26,7 +27,7 @@ image: {{ $.ImageName }}
2627
from: {{ $.BASE_SCRATCH }}
2728

2829
import:
29-
- artifact: {{ $.ImageName }}-golang-artifact
30+
- image: {{ $.ImageName }}-golang-artifact
3031
add: /controller
3132
to: /controller
3233
before: setup

images/csi-nfs/werf.inc.yaml

+14-10
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
{{- $_ := set . "BASE_ALT_DEV" "registry.deckhouse.io/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }}
77

88
---
9-
artifact: {{ $.ImageName }}-golang-artifact
9+
image: {{ $.ImageName }}-golang-artifact
1010
from: {{ $.BASE_GOLANG_22_ALPINE }}
11-
fromCacheVersion: "2024-05-14.1"
11+
final: false
12+
1213
git:
1314
- add: /images/{{ $.ImageName }}
1415
to: /
@@ -37,16 +38,18 @@ shell:
3738
---
3839
{{ $csiBinaries := "/bin/mount /bin/umount /sbin/mount.nfs /sbin/mount.nfs4 /sbin/umount.nfs /sbin/umount.nfs4 /bin/tar /bin/gzip /bin/cp" }}
3940
---
40-
artifact: {{ $.ImageName }}-binaries-artifact
41+
image: {{ $.ImageName }}-binaries-artifact
4142
from: {{ $.BASE_ALT_DEV }}
43+
final: false
4244

4345
shell:
4446
install:
4547
- /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate
4648

4749
---
48-
artifact: {{ $.ImageName }}-distroless-artifact
50+
image: {{ $.ImageName }}-distroless-artifact
4951
from: {{ $.BASE_ALPINE_DEV }}
52+
final: false
5053

5154
shell:
5255
install:
@@ -62,31 +65,32 @@ shell:
6265
- echo "deckhouse:!::0:::::" >> /relocate/etc/shadow
6366

6467
---
65-
artifact: {{ $.ImageName }}-distroless
68+
image: {{ $.ImageName }}-distroless
6669
from: {{ $.BASE_SCRATCH }}
70+
final: false
6771

6872
import:
69-
- artifact: {{ $.ImageName }}-distroless-artifact
73+
- image: {{ $.ImageName }}-distroless-artifact
7074
add: /relocate
7175
to: /
7276
before: setup
7377

7478
---
7579
image: {{ $.ImageName }}
76-
fromArtifact: {{ $.ImageName }}-distroless
80+
fromImage: {{ $.ImageName }}-distroless
7781

7882
import:
79-
- artifact: {{ $.ImageName }}-golang-artifact
83+
- image: {{ $.ImageName }}-golang-artifact
8084
add: /nfsplugin
8185
to: /nfsplugin
8286
before: setup
83-
- artifact: {{ $.ImageName }}-binaries-artifact
87+
- image: {{ $.ImageName }}-binaries-artifact
8488
add: /relocate
8589
to: /
8690
before: install
8791
includePaths:
8892
- '**/*'
89-
- artifact: {{ $.ImageName }}-binaries-artifact
93+
- image: {{ $.ImageName }}-binaries-artifact
9094
add: /lib64
9195
to: /lib64
9296
before: install

images/webhooks/werf.inc.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
{{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }}
33

44
---
5-
artifact: {{ $.ImageName }}-golang-artifact
5+
image: {{ $.ImageName }}-golang-artifact
66
from: {{ $.BASE_GOLANG_22_ALPINE }}
7+
final: false
78

89
git:
910
- add: /images/webhooks/src
@@ -25,7 +26,7 @@ image: {{ $.ImageName }}
2526
from: {{ $.BASE_SCRATCH }}
2627

2728
import:
28-
- artifact: {{ $.ImageName }}-golang-artifact
29+
- image: {{ $.ImageName }}-golang-artifact
2930
add: /webhooks
3031
to: /webhooks
3132
before: setup

0 commit comments

Comments
 (0)