Skip to content

Commit f031e32

Browse files
AntonFomichev-FlantAntonFomichev-Flant
committed
more tools
Signed-off-by: Anton Fomichev <anton.fomichev@flant.com>
1 parent 06bc60b commit f031e32

File tree

32 files changed

+69
-2291
lines changed

32 files changed

+69
-2291
lines changed

‎images/packages/keyutils/werf.inc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ fromImage: builder/scratch
55
import:
66
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
77
add: /out
8-
to: /{{ $.ImageName }}
8+
to: /{{ .ImageName }}
99
before: setup
1010
---
1111
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
1212
final: false
1313
fromImage: builder/distroless
1414
shell:
1515
install:
16-
- pm install keyutils -d /out
16+
- pm install {{ .ImageName }} -d /out

‎images/packages/libidn/werf.inc.yaml‎

Lines changed: 3 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
---
2-
{{- $version := get $.PackageVersion $.ImageName }}
3-
{{- $gitRepoUrl := "libidn/libidn.git" }}
4-
5-
{{- $name := print $.ImageName "-dependencies" -}}
6-
{{- define "$name" -}}
7-
altPackages:
8-
- gcc git make makeinfo automake libtool patch gperf help2man gengetopt
9-
- python3 python3-module-docutils gtk-doc
10-
- gettext texinfo indent libabigail-devel
11-
- cvs
12-
packages:
13-
- libunistring
14-
- glibc
15-
{{- end -}}
16-
17-
{{ $builderDependencies := include "$name" . | fromYaml }}
18-
192
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}
203
final: false
214
fromImage: builder/scratch
@@ -24,69 +7,10 @@ import:
247
add: /out
258
to: /libidn
269
before: setup
27-
2810
---
29-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
11+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
3012
final: false
31-
fromImage: builder/src
32-
secrets:
33-
- id: SOURCE_REPO
34-
value: {{ $.SOURCE_REPO_GIT }}
13+
fromImage: builder/distroless
3514
shell:
3615
install:
37-
- |
38-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
39-
40-
cd /src
41-
GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
42-
git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
43-
cd gnulib
44-
git checkout $GNULIB_REVISION
45-
cd /
46-
47-
---
48-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder
49-
final: false
50-
fromImage: builder/alt
51-
import:
52-
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
53-
add: /src
54-
to: /src
55-
before: install
56-
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
57-
shell:
58-
beforeInstall:
59-
{{- include "alt packages proxy" . | nindent 2 }}
60-
- |
61-
apt-get install -y \
62-
{{ $builderDependencies.altPackages | join " " }}
63-
64-
{{- include "alt packages clean" . | nindent 2 }}
65-
66-
install:
67-
- |
68-
# Install packages
69-
PKGS="{{ $builderDependencies.packages | join " " }}"
70-
for pkg in $PKGS; do
71-
cp -a /$pkg/. /
72-
rm -rf /$pkg
73-
done
74-
75-
OUTDIR=/out
76-
77-
cd /src
78-
export GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
79-
export GNULIB_SRCDIR=$(pwd)/gnulib
80-
81-
./bootstrap --skip-po --no-git
82-
./configure \
83-
--prefix=/usr \
84-
--libdir=/usr/lib64 \
85-
--disable-static \
86-
--disable-silent-rules \
87-
--disable-nls \
88-
--disable-doc
89-
90-
make -j$(nproc)
91-
make DESTDIR=$OUTDIR install
92-
rm -rf /out/usr/share
16+
- pm install {{ .ImageName }} -d /out

‎images/packages/libidn2/werf.inc.yaml‎

Lines changed: 3 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -7,74 +7,10 @@ import:
77
add: /out
88
to: /libidn2
99
before: setup
10-
1110
---
12-
{{- $version := get $.PackageVersion $.ImageName }}
13-
{{- $gitRepoUrl := "libidn/libidn2.git" }}
14-
15-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
11+
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
1612
final: false
17-
fromImage: builder/src
18-
secrets:
19-
- id: SOURCE_REPO
20-
value: {{ $.SOURCE_REPO_GIT }}
13+
fromImage: builder/distroless
2114
shell:
2215
install:
23-
- |
24-
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
25-
26-
cd /src
27-
GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
28-
git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
29-
cd gnulib
30-
git checkout $GNULIB_REVISION
31-
cd /
32-
33-
---
34-
35-
{{- $name := print $.ImageName "-dependencies" -}}
36-
{{- define "$name" -}}
37-
packages:
38-
- gcc git make makeinfo automake libtool patch gperf help2man gengetopt
39-
- python3 python3-module-docutils gtk-doc
40-
- gettext texinfo libabigail-devel indent
41-
{{- end -}}
42-
43-
{{ $builderDependencies := include "$name" . | fromYaml }}
44-
45-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder
46-
final: false
47-
fromImage: builder/alt
48-
import:
49-
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
50-
add: /src
51-
to: /src
52-
before: install
53-
shell:
54-
beforeInstall:
55-
{{- include "alt packages proxy" . | nindent 2 }}
56-
- |
57-
apt-get install -y \
58-
{{ $builderDependencies.packages | join " " }}
59-
60-
{{- include "alt packages clean" . | nindent 2 }}
61-
62-
install:
63-
- |
64-
OUTDIR=/out
65-
66-
cd /src
67-
export GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
68-
export GNULIB_SRCDIR=$(pwd)/gnulib
69-
70-
./bootstrap --skip-po --no-git
71-
./configure \
72-
--prefix=/usr \
73-
--libdir=/usr/lib64 \
74-
--disable-static \
75-
--disable-silent-rules \
76-
--disable-nls \
77-
--disable-doc
78-
79-
make -j$(nproc)
80-
make DESTDIR=$OUTDIR install
16+
- pm install {{ .ImageName }} -d /out

‎images/packages/libjson-c5/werf.inc.yaml‎

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -7,74 +7,10 @@ import:
77
add: /out
88
to: /{{ $.ImageName }}
99
before: setup
10-
1110
---
12-
{{- $version := get .PackageVersion .ImageName }}
13-
{{- $gitRepoUrl := "json-c/json-c.git" }}
14-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
15-
final: false
16-
fromImage: builder/src
17-
secrets:
18-
- id: SOURCE_REPO
19-
value: {{ $.SOURCE_REPO_GIT }}
20-
shell:
21-
install:
22-
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
23-
---
24-
25-
{{- $name := print $.ImageName "-dependencies" -}}
26-
{{- define "$name" -}}
27-
altPackages:
28-
- gcc git make libtool gettext-tools cmake
29-
- tree
30-
{{- end -}}
31-
32-
{{ $builderDependencies := include "$name" . | fromYaml }}
33-
34-
3511
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
3612
final: false
37-
fromImage: builder/alt
38-
secrets:
39-
- id: SOURCE_REPO
40-
value: {{ $.SOURCE_REPO_GIT }}
41-
import:
42-
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
43-
add: /src
44-
to: /src
45-
before: install
13+
fromImage: builder/distroless
4614
shell:
47-
beforeInstall:
48-
{{- include "alt packages proxy" . | nindent 2 }}
49-
- |
50-
apt-get install -y \
51-
{{ $builderDependencies.altPackages | join " " }}
52-
53-
{{- include "alt packages clean" . | nindent 2 }}
54-
5515
install:
56-
- |
57-
OUTDIR=/out
58-
cd /src
59-
cmake \
60-
-DCMAKE_BUILD_TYPE=Release \
61-
-DCMAKE_INSTALL_LIBDIR=/usr/lib64 \
62-
-DBUILD_STATIC_LIBS:BOOL=OFF \
63-
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
64-
-DCMAKE_C_FLAGS_RELEASE:STRING="" \
65-
-DDISABLE_BSYMBOLIC:BOOL=OFF \
66-
-DDISABLE_WERROR:BOOL=OFF \
67-
-DENABLE_RDRAND:BOOL=OFF \
68-
-DENABLE_THREADING:BOOL=ON
69-
70-
cmake --build . --parallel $(nproc)
71-
DESTDIR=$OUTDIR cmake --install .
72-
rm -rf $OUTDIR/usr/share/man
73-
rm -rf $OUTDIR/usr/lib64/cmake
74-
find $OUTDIR -type f -executable | while read -r execfile; do
75-
if strip "$execfile"; then
76-
echo "Stripped: $execfile"
77-
fi
78-
done
79-
tree -hp $OUTDIR
80-
16+
- pm install json-c -d /out

‎images/packages/libmnl/werf.inc.yaml‎

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,81 +7,10 @@ import:
77
add: /out
88
to: /{{ $.ImageName }}
99
before: setup
10-
1110
---
12-
{{- $version := get .PackageVersion .ImageName }}
13-
{{- $gitRepoUrl := "libmnl.git" }}
14-
15-
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
16-
final: false
17-
fromImage: builder/src
18-
secrets:
19-
- id: SOURCE_REPO
20-
value: {{ $.SOURCE_REPO_GIT }}
21-
shell:
22-
install:
23-
- git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
24-
25-
---
26-
27-
{{- $name := print $.ImageName "-dependencies" -}}
28-
{{- define "$name" -}}
29-
altPackages:
30-
- gcc make git autoconf libtool gettext-tools
31-
- automake pkgconf
32-
- texinfo indent
33-
- libabigail-devel cvs
34-
- tree
35-
packages:
36-
- libunistring
37-
- systemd
38-
- glibc
39-
{{- end -}}
40-
41-
{{ $builderDependencies := include "$name" . | fromYaml }}
42-
4311
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
4412
final: false
45-
fromImage: builder/alt
46-
import:
47-
- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
48-
add: /src
49-
to: /src
50-
before: install
51-
{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
13+
fromImage: builder/distroless
5214
shell:
53-
beforeInstall:
54-
{{- include "alt packages proxy" . | nindent 2 }}
55-
- |
56-
apt-get install -y \
57-
{{ $builderDependencies.altPackages | join " " }}
58-
59-
{{- include "alt packages clean" . | nindent 2 }}
60-
6115
install:
62-
- |
63-
# Install packages
64-
PKGS="{{ $builderDependencies.packages | join " " }}"
65-
for pkg in $PKGS; do
66-
cp -a /$pkg/. /
67-
rm -rf /$pkg
68-
done
69-
70-
OUTDIR=/out
71-
72-
cd /src
73-
74-
./autogen.sh
75-
./configure \
76-
--prefix=/usr \
77-
--libdir=/usr/lib64
78-
79-
make -j$(nproc)
80-
81-
make DESTDIR=$OUTDIR install
82-
83-
find $OUTDIR -type f -executable | while read -r execfile; do
84-
if strip "$execfile"; then
85-
echo "Stripped: $execfile"
86-
fi
87-
done
16+
- pm install {{ .ImageName }} -d /out

0 commit comments

Comments
 (0)