Skip to content

Commit 976a28f

Browse files
alexey-gavrilov-flantnevermarine
authored andcommitted
[cse] fixed path to source code (#1551)
Signed-off-by: Aleksey Gavrilov <[email protected]> (cherry picked from commit 1a025d0) Signed-off-by: Isteb4k <[email protected]> # Conflicts: # images/virt-artifact/werf.inc.yaml Signed-off-by: Maksim Fedotov <[email protected]>
1 parent 976077f commit 976a28f

File tree

4 files changed

+23
-27
lines changed

4 files changed

+23
-27
lines changed

images/dvcr/werf.inc.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ shell:
1414
- |
1515
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
1616
echo "Git clone CDI repository..."
17-
git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /distribution
17+
mkdir -p /src
18+
git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src/distribution
19+
1820
1921
---
2022
image: {{ .ModuleNamePrefix }}{{ .ImageName }}
@@ -45,7 +47,7 @@ mount:
4547
to: /go/pkg
4648
import:
4749
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
48-
add: /distribution
50+
add: /src/distribution
4951
to: /distribution
5052
before: install
5153
secrets:

images/hooks/werf.inc.yaml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,30 @@ final: false
44
fromImage: builder/src
55
git:
66
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
7-
to: /app/images/hooks
7+
to: /src/images/hooks
88
stageDependencies:
99
install:
10-
- go.mod
11-
- go.sum
12-
setup:
13-
- "**/*.go"
10+
- "**/*"
1411
- add: {{ .ModuleDir }}/images/virtualization-artifact
15-
to: /app/images/virtualization-artifact
12+
to: /src/images/virtualization-artifact
1613
stageDependencies:
1714
install:
18-
- go.mod
19-
- go.sum
20-
setup:
21-
- "**/*.go"
15+
- "**/*"
2216
- add: {{ .ModuleDir }}/api
23-
to: /app/api
17+
to: /src/api
2418
stageDependencies:
2519
install:
26-
- go.mod
27-
- go.sum
28-
setup:
29-
- "**/*.go"
20+
- "**/*"
21+
shell:
22+
install:
23+
- cd /src
3024
---
3125
image: {{ .ModuleNamePrefix }}go-hooks-artifact
3226
final: false
3327
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
3428
import:
3529
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
36-
add: /app
30+
add: /src
3731
to: /app
3832
before: install
3933
mount:

images/libvirt/werf.inc.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ final: false
88
fromImage: builder/src
99
git:
1010
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
11-
to: /
11+
to: /src
1212
includePaths:
1313
- install-libvirt.sh
1414
- patches
@@ -23,9 +23,9 @@ secrets:
2323
shell:
2424
install:
2525
- |
26-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /{{ $gitRepoName }}-{{ $version }}
26+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src/{{ $gitRepoName }}-{{ $version }}
2727
28-
cd /{{ $gitRepoName }}-{{ $version }}
28+
cd /src/{{ $gitRepoName }}-{{ $version }}
2929
3030
if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
3131
echo "Checkout submodules"
@@ -100,15 +100,15 @@ final: false
100100
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
101101
import:
102102
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
103-
add: /{{ $gitRepoName }}-{{ $version }}
103+
add: /src/{{ $gitRepoName }}-{{ $version }}
104104
to: /{{ $gitRepoName }}-{{ $version }}
105105
before: install
106106
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
107-
add: /patches
107+
add: /src/patches
108108
to: /patches
109109
before: install
110110
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
111-
add: /install-libvirt.sh
111+
add: /src/install-libvirt.sh
112112
to: /install-libvirt.sh
113113
before: install
114114
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}

images/qemu/werf.inc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ shell:
3232
{{- include "alt packages clean" . | nindent 2}}
3333
install:
3434
- |
35-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /{{ $gitRepoName }}-{{ $version }}
35+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src/{{ $gitRepoName }}-{{ $version }}
3636
37-
cd /{{ $gitRepoName }}-{{ $version }}
37+
cd /src/{{ $gitRepoName }}-{{ $version }}
3838
3939
if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
4040
echo "Checkout submodules"
@@ -147,7 +147,7 @@ final: false
147147
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
148148
import:
149149
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
150-
add: /{{ $gitRepoName }}-{{ $version }}
150+
add: /src/{{ $gitRepoName }}-{{ $version }}
151151
to: /{{ $gitRepoName }}-{{ $version }}
152152
before: install
153153
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact

0 commit comments

Comments
 (0)