Skip to content

Commit 95cbfee

Browse files
nevermarinenevermarine
committed
chore(ci): import libs (#1541)
Signed-off-by: Maksim Fedotov <[email protected]>
1 parent 1bc72e2 commit 95cbfee

File tree

83 files changed

+4172
-892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4172
-892
lines changed

‎build/components/versions.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ package:
1515
file: FILE5_45
1616
gcc: releases/gcc-13.2.0
1717
glib2: 2.84.2
18-
glibc: glibc-2.38
18+
# release/2.38/master from upstream glibc
19+
# https://sourceware.org/git/?p=glibc.git;a=commit;h=650a0aaaffa9ddb44732fa6156b31c5f30ee596f
20+
# https://git.altlinux.org/gears/g/glibc.git?p=glibc.git;a=log;h=bb14266fc6e81ea0239c3974d32c57f3fdefe86d
21+
glibc: 650a0aaaffa9ddb44732fa6156b31c5f30ee596f # release/2.38/master
1922
libgmp: 6.3.0
2023
gnutls: 3.8.10
2124
libattr: v2.5.2

‎images/base-alt-p11-binaries/werf.inc.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
{{- $name := print $.ImageName "-dependencies" -}}
33
{{- define "$name" -}}
44
altPackages:
5-
- glibc-utils
6-
- mount xfsprogs xfstests util-linux
5+
- xfsprogs xfstests
76
packages:
87
- libssh libssh2
98
- libffi e2fsprogs
9+
- util-linux
10+
- glibc
1011
{{- end -}}
1112

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

‎images/cdi-artifact/werf.inc.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ packages:
1414
- xz
1515
- libtasn1
1616
- libunistring
17+
- libffi libgmp gnutls
18+
- nettle libidn2
19+
- p11-kit zlib
20+
- glibc
1721
{{- end -}}
1822

1923
{{ $builderDependencies := include "$name" . | fromYaml }}
@@ -43,7 +47,7 @@ shell:
4347
---
4448
image: {{ .ModuleNamePrefix }}{{ .ImageName }}
4549
final: false
46-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24.9" }}
50+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24.10" }}
4751
mount:
4852
- fromPath: ~/go-pkg-cache
4953
to: /go/pkg
@@ -62,8 +66,8 @@ shell:
6266
beforeInstall:
6367
{{- include "alt packages proxy" . | nindent 2 }}
6468
- |
65-
apt-get -qq install -y libxml2-devel \
66-
git binutils make gcc glibc-pthread glibc-devel glibc-devel-static golang
69+
apt-get -qq install -y \
70+
git binutils make gcc golang
6771
{{- include "alt packages clean" . | nindent 2 }}
6872
install:
6973
- |
@@ -143,7 +147,7 @@ shell:
143147
---
144148
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder
145149
final: false
146-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.9" }}
150+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.10" }}
147151
git:
148152
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
149153
to: /

‎images/cdi-cloner/werf.inc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ shell:
5353
---
5454
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuild
5555
final: false
56-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.9" }}
56+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.10" }}
5757
git:
5858
- add: {{ .ModuleDir }}/images/{{ .ImageName }}/cloner-startup
5959
to: /app

‎images/cdi-importer/werf.inc.yaml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,28 @@ imageSpec:
1616

1717
---
1818
{{- define "cdi-importer-deps" -}}
19-
libraries:
20-
- libsqlite3
2119
binaries:
2220
# nbd bins and libs
2321
- /usr/sbin/nbdkit
2422
- /usr/lib64/nbdkit/filters/*.so
2523
- /usr/lib64/nbdkit/plugins/*.so
26-
# Sqlite libs
27-
- /usr/lib64/libsqlite3.so.0
2824
# CDI binaries
2925
- /usr/bin/cdi-image-size-detection /usr/bin/cdi-importer /usr/bin/cdi-source-update-poller
26+
# QEMU bins
27+
- /usr/bin/qemu-img
28+
# do not include glibc, it will be replaced by one from qemu-img
3029
packages:
3130
- nbdkit libnbd
3231
- libtasn1 libxml2
32+
- xz
33+
- libunistring
34+
- libffi libgmp gnutls
35+
- nettle libidn2
36+
- p11-kit zlib
37+
- glib2 libbsd libfuse3
38+
- gcc ubdsrv liburing
39+
- libaio libaudit libcap-ng numactl
40+
- linux-pam zstd
3341
{{- end -}}
3442

3543
{{ $cdiImporterDependencies := include "cdi-importer-deps" . | fromYaml }}
@@ -56,19 +64,15 @@ import:
5664
- cdi-source-update-poller
5765
- image: {{ .ModuleNamePrefix }}qemu
5866
add: /qemu-img
59-
to: /relocate
60-
before: setup
67+
to: /qemu-img
68+
before: install
6169
{{- include "importPackageImages" (list . $cdiImporterDependencies.packages "install") -}}
6270
shell:
6371
install:
64-
{{- include "alt packages proxy" . | nindent 2 }}
65-
- |
66-
apt-get install --yes \
67-
{{ $cdiImporterDependencies.libraries | join " " }}
68-
{{- include "alt packages clean" . | nindent 2 }}
6972
- |
7073
echo "Install packages"
7174
PKGS="{{ $cdiImporterDependencies.packages | join " " }}"
75+
PKGS+=" qemu-img"
7276
for pkg in $PKGS; do
7377
cp -a /$pkg/. /
7478
rm -rf /$pkg

‎images/dvcr-artifact/werf.inc.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
{{- $nameDeps := print $.ImageName "-dependencies" -}}
33
{{- define "$nameDeps" -}}
44
altPackages:
5-
- gcc glibc-pthread glibc-devel glibc-devel-static
5+
- gcc
66
- git golang make binutils
77
packages:
88
- libnbd
99
- libxml2
10+
- glibc
1011
{{- end -}}
1112

1213
{{ $builderDeps := include "$nameDeps" . | fromYaml }}
1314

1415
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder
1516
final: false
16-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24.9" }}
17+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/golang-alt-svace-1.24.10" }}
1718
git:
1819
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
1920
to: /src
@@ -82,6 +83,12 @@ binaries:
8283
- /usr/lib64/libnbd.s*
8384
packages:
8485
- bzip2 file nbdkit libnbd xz libxml2
86+
- libseccomp zlib zstd
87+
- libffi libgmp gnutls nettle libidn2
88+
- p11-kit libtasn1 libfuse3
89+
- gcc ubdsrv liburing
90+
- libaio libaudit libcap-ng numactl
91+
- linux-pam libunistring glib2
8592
{{- end -}}
8693

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

‎images/dvcr/werf.inc.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ secrets:
1212
shell:
1313
install:
1414
- |
15-
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
1615
echo "Git clone CDI repository..."
1716
mkdir -p /src
1817
git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src/distribution
@@ -41,7 +40,7 @@ imageSpec:
4140
---
4241
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder
4342
final: false
44-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.9" }}
43+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.10" }}
4544
mount:
4645
- fromPath: ~/go-pkg-cache
4746
to: /go/pkg

‎images/edk2/werf.inc.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{{- define "$name" -}}
88
altPackages:
99
- gcc gcc-c++
10-
- git curl
10+
- git
1111
- bash-completion
1212
- clang
1313
- ccache
@@ -19,12 +19,13 @@ altPackages:
1919
- dosfstools mtools genisoimage binutils-devel
2020
- qemu-kvm-core
2121
- iasl
22-
- python3-modules-sqlite3 python3-module-virt-firmware libuuid-devel
23-
- libdwarf-devel libuuid-devel
22+
- python3-modules-sqlite3 python3-module-virt-firmware
23+
- libdwarf-devel
2424
- bc perl-PathTools perl-IPC-Cmd perl-JSON
2525
packages:
2626
- zlib libisoburn libburn libisofs
2727
- openssl
28+
- libcurl util-linux
2829
{{- end -}}
2930

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

‎images/hooks/werf.inc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ shell:
2424
---
2525
image: {{ .ModuleNamePrefix }}go-hooks-artifact
2626
final: false
27-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.9" }}
27+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.10" }}
2828
import:
2929
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
3030
add: /src

‎images/kube-api-rewriter/werf.inc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder
33
final: false
4-
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.9" }}
4+
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/golang-alt-svace-1.24.10" }}
55
git:
66
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
77
to: /src/kube-api-rewriter

0 commit comments

Comments
 (0)