Skip to content

Commit 30604fd

Browse files
kobzonegakobzonega
authored
Use DEBUGINFO_LINES_ONLY param for ydbd binary in breakpad docker tag (#11671)
1 parent b2ab948 commit 30604fd

File tree

4 files changed

+272
-21
lines changed

4 files changed

+272
-21
lines changed

‎ydb/deploy/docker/README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ya package --docker ydb/deploy/docker/release/pkg.json
3131

3232
Used base image and included:
3333
- ydb cli binary
34-
- ydbd server strip'ed binary
34+
- ydbd server strip'ed binary baked with build type `Release`
3535

3636
### Breakpad
3737

@@ -41,10 +41,10 @@ Image with google breakpad assets to collect minidump
4141
ya package --docker ydb/deploy/docker/breakpad/pkg.json
4242
```
4343

44-
Used base image and included:
44+
Used base breakpad image and included:
4545

4646
- ydb cli binary
47-
- ydbd server strip'ed binary
47+
- ydbd server binary baked with build flag `DEBUGINFO_LINES_ONLY`
4848

4949
### Debug
5050

@@ -54,6 +54,8 @@ Image with debug symbols and utils for dev purposes
5454
ya package --docker ydb/deploy/docker/debug/pkg.json
5555
```
5656

57-
Extend breakpad image with:
57+
Used base breakpad image and included:
5858
- additional packages with debug utils (dnsutils, telnet, netcat-openbsd, iputils-ping, curl)
59+
- ydb cli binary
60+
- ydbd server strip'ed binary baked with build type `Release`
5961
- debug symbols for ydbd binary

‎ydb/deploy/docker/breakpad/pkg.json

+128-4
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,141 @@
1111
"docker_repository": "crp2lrlsrs36odlvd8dv",
1212
"docker_target": "breakpad"
1313
},
14-
"include": [
15-
"ydb/deploy/docker/release/pkg.json"
16-
],
14+
"build": {
15+
"build_type": "release",
16+
"targets": [
17+
"ydb/apps/ydbd",
18+
"ydb/apps/ydb",
19+
"contrib/libs/libiconv/dynamic",
20+
"contrib/libs/libidn/dynamic",
21+
"contrib/libs/libaio/dynamic"
22+
],
23+
"flags": [
24+
{
25+
"name": "OPENSOURCE",
26+
"value": "yes"
27+
},
28+
{
29+
"name": "HARDENING",
30+
"value": "yes"
31+
},
32+
{
33+
"name": "CFLAGS",
34+
"value": "-fno-omit-frame-pointer"
35+
},
36+
{
37+
"name": "DEBUGINFO_LINES_ONLY",
38+
"value": "yes"
39+
}
40+
],
41+
"target-platforms": [
42+
"default-linux-x86_64"
43+
]
44+
},
1745
"data": [
1846
{
1947
"source": {
2048
"type": "ARCADIA",
2149
"path": "ydb/deploy/docker/breakpad/minidump_script.py"
2250
},
2351
"destination": {
24-
"path": "/minidump_script.py"
52+
"path": "/minidump_script.py",
53+
"attributes": {
54+
"mode": {
55+
"value": "a+x"
56+
}
57+
}
58+
}
59+
},
60+
{
61+
"source": {
62+
"type": "ARCADIA",
63+
"path": "ydb/deploy/docker/Dockerfile"
64+
},
65+
"destination": {
66+
"path": "/Dockerfile"
67+
}
68+
},
69+
{
70+
"source": {
71+
"type": "ARCADIA",
72+
"path": "AUTHORS"
73+
},
74+
"destination": {
75+
"path": "/AUTHORS"
76+
}
77+
},
78+
{
79+
"source": {
80+
"type": "ARCADIA",
81+
"path": "LICENSE"
82+
},
83+
"destination": {
84+
"path": "/LICENSE"
85+
}
86+
},
87+
{
88+
"source": {
89+
"type": "ARCADIA",
90+
"path": "README.md"
91+
},
92+
"destination": {
93+
"path": "/README.md"
94+
}
95+
},
96+
{
97+
"source": {
98+
"type": "BUILD_OUTPUT",
99+
"path": "contrib/libs/libiconv/dynamic/libiconv.so"
100+
},
101+
"destination": {
102+
"path": "/libiconv.so"
103+
}
104+
},
105+
{
106+
"source": {
107+
"type": "BUILD_OUTPUT",
108+
"path": "contrib/libs/libidn/dynamic/liblibidn-dynamic.so"
109+
},
110+
"destination": {
111+
"path": "/liblibidn-dynamic.so"
112+
}
113+
},
114+
{
115+
"source": {
116+
"type": "BUILD_OUTPUT",
117+
"path": "contrib/libs/libaio/dynamic/liblibaio-dynamic.so"
118+
},
119+
"destination": {
120+
"path": "/liblibaio-dynamic.so"
121+
}
122+
},
123+
{
124+
"source": {
125+
"type": "BUILD_OUTPUT",
126+
"path": "ydb/apps/ydbd/ydbd"
127+
},
128+
"destination": {
129+
"path": "/ydbd",
130+
"attributes": {
131+
"mode": {
132+
"value": "a+x"
133+
}
134+
}
135+
}
136+
},
137+
{
138+
"source": {
139+
"type": "BUILD_OUTPUT",
140+
"path": "ydb/apps/ydb/ydb"
141+
},
142+
"destination": {
143+
"path": "/ydb",
144+
"attributes": {
145+
"mode": {
146+
"value": "a+x"
147+
}
148+
}
25149
}
26150
}
27151
]

‎ydb/deploy/docker/debug/pkg.json

+138-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,142 @@
1111
"docker_repository": "crp2lrlsrs36odlvd8dv",
1212
"docker_target": "debug"
1313
},
14-
"include": [
15-
"ydb/deploy/docker/breakpad/pkg.json"
16-
],
17-
"data": []
14+
"build": {
15+
"build_type": "release",
16+
"targets": [
17+
"ydb/apps/ydbd",
18+
"ydb/apps/ydb",
19+
"contrib/libs/libiconv/dynamic",
20+
"contrib/libs/libidn/dynamic",
21+
"contrib/libs/libaio/dynamic"
22+
],
23+
"flags": [
24+
{
25+
"name": "OPENSOURCE",
26+
"value": "yes"
27+
},
28+
{
29+
"name": "HARDENING",
30+
"value": "yes"
31+
},
32+
{
33+
"name": "CFLAGS",
34+
"value": "-fno-omit-frame-pointer"
35+
},
36+
{
37+
"name": "SPLIT_DWARF_VALUE",
38+
"value": "yes"
39+
}
40+
],
41+
"target-platforms": [
42+
"default-linux-x86_64"
43+
]
44+
},
45+
"data": [
46+
{
47+
"source": {
48+
"type": "ARCADIA",
49+
"path": "ydb/deploy/docker/breakpad/minidump_script.py"
50+
},
51+
"destination": {
52+
"path": "/minidump_script.py",
53+
"attributes": {
54+
"mode": {
55+
"value": "a+x"
56+
}
57+
}
58+
}
59+
},
60+
{
61+
"source": {
62+
"type": "ARCADIA",
63+
"path": "ydb/deploy/docker/Dockerfile"
64+
},
65+
"destination": {
66+
"path": "/Dockerfile"
67+
}
68+
},
69+
{
70+
"source": {
71+
"type": "ARCADIA",
72+
"path": "AUTHORS"
73+
},
74+
"destination": {
75+
"path": "/AUTHORS"
76+
}
77+
},
78+
{
79+
"source": {
80+
"type": "ARCADIA",
81+
"path": "LICENSE"
82+
},
83+
"destination": {
84+
"path": "/LICENSE"
85+
}
86+
},
87+
{
88+
"source": {
89+
"type": "ARCADIA",
90+
"path": "README.md"
91+
},
92+
"destination": {
93+
"path": "/README.md"
94+
}
95+
},
96+
{
97+
"source": {
98+
"type": "BUILD_OUTPUT",
99+
"path": "contrib/libs/libiconv/dynamic/libiconv.so"
100+
},
101+
"destination": {
102+
"path": "/libiconv.so"
103+
}
104+
},
105+
{
106+
"source": {
107+
"type": "BUILD_OUTPUT",
108+
"path": "contrib/libs/libidn/dynamic/liblibidn-dynamic.so"
109+
},
110+
"destination": {
111+
"path": "/liblibidn-dynamic.so"
112+
}
113+
},
114+
{
115+
"source": {
116+
"type": "BUILD_OUTPUT",
117+
"path": "contrib/libs/libaio/dynamic/liblibaio-dynamic.so"
118+
},
119+
"destination": {
120+
"path": "/liblibaio-dynamic.so"
121+
}
122+
},
123+
{
124+
"source": {
125+
"type": "BUILD_OUTPUT",
126+
"path": "ydb/apps/ydbd/ydbd"
127+
},
128+
"destination": {
129+
"path": "/ydbd",
130+
"attributes": {
131+
"mode": {
132+
"value": "a+x"
133+
}
134+
}
135+
}
136+
},
137+
{
138+
"source": {
139+
"type": "BUILD_OUTPUT",
140+
"path": "ydb/apps/ydb/ydb"
141+
},
142+
"destination": {
143+
"path": "/ydb",
144+
"attributes": {
145+
"mode": {
146+
"value": "a+x"
147+
}
148+
}
149+
}
150+
}
151+
]
18152
}

‎ydb/deploy/docker/release/pkg.json

-9
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,6 @@
120120
}
121121
}
122122
},
123-
{
124-
"source": {
125-
"type": "BUILD_OUTPUT",
126-
"path": "ydb/apps/ydbd/ydbd.debug"
127-
},
128-
"destination": {
129-
"path": "/ydbd.debug"
130-
}
131-
},
132123
{
133124
"source": {
134125
"type": "BUILD_OUTPUT",

0 commit comments

Comments
 (0)