Skip to content

Commit 4a8a3a4

Browse files
chore(core): build openssl (#963)
Build the openssl package and replace it in virt-launcher image. --------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 26ad6d1 commit 4a8a3a4

3 files changed

Lines changed: 61 additions & 3 deletions

File tree

component_versions/version_map.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ package:
66
swtpm: 0.10.0
77
xorriso: 1.5.6
88
numactl: 2.0.19
9+
openssl: openssl-3.4.1
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
image: {{ $.ImageType }}/{{ $.ImageName }}
3+
final: false
4+
fromImage: builder/scratch
5+
import:
6+
- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
7+
add: /out
8+
to: /openssl
9+
before: setup
10+
11+
---
12+
{{- $version := get $.Package $.ImageName }}
13+
{{- $gitRepoUrl := "openssl/openssl.git" }}
14+
15+
{{- $name := print $.ImageName "-dependencies" -}}
16+
{{- define "$name" -}}
17+
packages:
18+
- gcc git make glibc-devel-static musl-devel-static
19+
- autoconf automake libtool makeinfo
20+
- perl-Net-SSLeay perl-IPC-Cmd perl-Pod-Html
21+
- autoconf libtool makeinfo gettext-devel po4a
22+
{{- end -}}
23+
24+
{{ $builderDependencies := include "$name" . | fromYaml }}
25+
26+
image: {{ $.ImageType }}/{{ $.ImageName }}-builder
27+
final: false
28+
fromImage: builder/alt
29+
secrets:
30+
- id: SOURCE_REPO
31+
value: {{ $.SOURCE_REPO }}
32+
shell:
33+
beforeInstall:
34+
- |
35+
apt-get update && apt-get install -y \
36+
{{ $builderDependencies.packages | join " " }}
37+
38+
apt-get clean
39+
rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
40+
41+
install:
42+
- |
43+
OUTDIR=/out
44+
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
45+
46+
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
47+
cd /src
48+
49+
./Configure --prefix=/usr CC=/usr/bin/musl-gcc -static
50+
make -j $(nproc)
51+
make install_sw -j $(nproc) DESTDIR=$OUTDIR
52+
strip $OUTDIR/usr/bin/openssl

images/virt-launcher/werf.inc.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ packages:
127127
- iptables
128128
- libffi8
129129
- nftables
130-
- openssl
131130
- passt
132131
- pcre
133132
- procps
@@ -141,8 +140,6 @@ binaries:
141140
- /usr/bin/ocsptool
142141
- /usr/bin/p11tool
143142
- /usr/bin/psktool
144-
# Openssl
145-
- /usr/bin/openssl
146143
# Xorriso (Creates an image of an ISO9660 filesystem)
147144
- /usr/bin/xorriso-dd-target /usr/bin/xorrisofs /usr/bin/xorriso
148145
# Swtpm
@@ -252,6 +249,13 @@ import:
252249
to: /xorriso
253250
before: install
254251

252+
# Statically builded
253+
- image: packages/binaries/openssl
254+
add: /openssl
255+
to: /relocate
256+
after: setup
257+
includePaths:
258+
- usr/bin/openssl
255259
- image: tools/coreutils
256260
add: /
257261
to: /relocate
@@ -261,6 +265,7 @@ import:
261265
- usr/bin/cp
262266
- usr/bin/sleep
263267
- usr/bin/coreutils
268+
264269
- image: {{ $.ImageName }}-cbuilder
265270
add: /bins
266271
to: /relocate/usr/bin

0 commit comments

Comments
 (0)