Skip to content

Commit 4d38ff2

Browse files
universal-itengineeruniversal-itengineer
committed
test: change .ImageName to .VPImageName
Signed-off-by: Nikita Korolev <[email protected]>
1 parent 197df01 commit 4d38ff2

File tree

14 files changed

+69
-69
lines changed

14 files changed

+69
-69
lines changed

‎.werf/defines/process-packages-images.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dockerfile: Dockerfile
3232
{{- $ImageData := regexReplaceAll "^images/(packages)/([0-9a-z-_]+)/([0-9a-z-_]+)/(Dockerfile|werf.inc.yaml)$" $path "${1}#${2}#${3}#${4}" | split "#" }}
3333

3434
{{- $_ := set $ctx "ImageType" (printf "%s/%s" $ImageData._0 $ImageData._1) }}
35-
{{- $_ := set $ctx "ImageName" $ImageData._2 }}
35+
{{- $_ := set $ctx "VPImageName" $ImageData._2 }}
3636
{{- $_ := set $ctx "ImageBuildData" $content }}
3737
{{- $_ := set $ctx "Files" $Root.Files }}
3838
{{- $_ := set $ctx "SOURCE_REPO" $Root.SOURCE_REPO }}

‎images/packages/binaries/acl/werf.inc.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
8-
to: /{{ $.ImageName }}
8+
to: /{{ $.VPImageName }}
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "acl.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc
@@ -23,7 +23,7 @@ packages:
2323

2424
{{ $builderDependencies := include "$name" . | fromYaml }}
2525

26-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
26+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2727
final: false
2828
fromImage: builder/alt
2929
secrets:

‎images/packages/binaries/bzip2/werf.inc.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
# development pkgs
3-
image: {{ $.ImageType }}/{{ $.ImageName }}
3+
image: {{ $.ImageType }}/{{ $.VPImageName }}
44
final: false
55
fromImage: builder/scratch
66
import:
7-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
7+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
88
add: /out
9-
to: /{{ $.ImageName }}
9+
to: /{{ $.VPImageName }}
1010
before: setup
1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "bzip2/bzip2.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc git libtool
@@ -23,7 +23,7 @@ packages:
2323

2424
{{ $builderDependencies := include "$name" . | fromYaml }}
2525

26-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
26+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2727
final: false
2828
fromImage: builder/alt
2929
secrets:

‎images/packages/binaries/dmidecode/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /dmidecode
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "dmidecode.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- git gcc
@@ -21,7 +21,7 @@ packages:
2121

2222
{{ $builderDependencies := include "$name" . | fromYaml }}
2323

24-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
24+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2525
final: false
2626
fromImage: builder/alt
2727
secrets:

‎images/packages/binaries/file/werf.inc.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
8-
to: /{{ $.ImageName }}
8+
to: /{{ $.VPImageName }}
99
before: setup
1010
---
11-
{{- $version := get $.Package $.ImageName }}
11+
{{- $version := get $.Package $.VPImageName }}
1212
{{- $gitRepoUrl := "file/file.git" }}
1313

14-
{{- $name := print $.ImageName "-dependencies" -}}
14+
{{- $name := print $.VPImageName "-dependencies" -}}
1515
{{- define "$name" -}}
1616
packages:
1717
- gcc git libtool
@@ -24,7 +24,7 @@ packages:
2424

2525
{{ $builderDependencies := include "$name" . | fromYaml }}
2626

27-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
27+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2828
final: false
2929
fromImage: builder/alt
3030
secrets:

‎images/packages/binaries/glib2/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /glib2
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "GNOME/glib.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc gcc-c++
@@ -22,7 +22,7 @@ packages:
2222

2323
{{ $builderDependencies := include "$name" . | fromYaml }}
2424

25-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
25+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2626
final: false
2727
fromImage: builder/alt
2828
secrets:

‎images/packages/binaries/glibc/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /glibc
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "glibc.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc
@@ -23,7 +23,7 @@ packages:
2323

2424
{{ $builderDependencies := include "$name" . | fromYaml }}
2525

26-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
26+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2727
final: false
2828
fromImage: builder/alt
2929
secrets:

‎images/packages/binaries/gnutls/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /gnutls
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "gnutls/gnutls.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc git gperf glibc-devel-static wget
@@ -28,7 +28,7 @@ packages:
2828

2929
{{ $builderDependencies := include "$name" . | fromYaml }}
3030

31-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
31+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
3232
final: false
3333
fromImage: builder/alt
3434
secrets:

‎images/packages/binaries/nbdkit/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /nbdkit
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "nbdkit/nbdkit.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- git gcc
@@ -40,7 +40,7 @@ packages:
4040

4141
{{ $builderDependencies := include "$name" . | fromYaml }}
4242

43-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
43+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
4444
final: false
4545
fromImage: builder/alt
4646
secrets:

‎images/packages/binaries/nftables/werf.inc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
image: {{ $.ImageType }}/{{ $.ImageName }}
2+
image: {{ $.ImageType }}/{{ $.VPImageName }}
33
final: false
44
fromImage: builder/scratch
55
import:
6-
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
6+
- image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
77
add: /out
88
to: /nftables
99
before: setup
1010

1111
---
12-
{{- $version := get $.Package $.ImageName }}
12+
{{- $version := get $.Package $.VPImageName }}
1313
{{- $gitRepoUrl := "nftables.git" }}
1414

15-
{{- $name := print $.ImageName "-dependencies" -}}
15+
{{- $name := print $.VPImageName "-dependencies" -}}
1616
{{- define "$name" -}}
1717
packages:
1818
- gcc
@@ -24,7 +24,7 @@ packages:
2424

2525
{{ $builderDependencies := include "$name" . | fromYaml }}
2626

27-
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
27+
image: {{ $.ImageType }}/{{ $.VPImageName }}-builder
2828
final: false
2929
fromImage: builder/alt
3030
secrets:

0 commit comments

Comments
 (0)