Skip to content

Commit fbefc7f

Browse files
committed
Add libatomic to rpm package list
- libatomic is already installed in the base image but only for non-x86 architectures - this causes a problem with the generated lock output - instead we can add libatomic as a package so then it will be correctly resolved for all architectures AI-attribution: AIA,Entirely human-created,v1.0 For more information on AI attribution statements, see: https://aiattribution.github.io/
1 parent 98ed3f6 commit fbefc7f

File tree

5 files changed

+33
-17
lines changed

5 files changed

+33
-17
lines changed

.konflux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /app
77

88
COPY . .
99

10-
RUN PKGS="rust-toolset protobuf-compiler" \
10+
RUN PKGS="rust-toolset protobuf-compiler libatomic" \
1111
&& dnf install -y $PKGS \
1212
&& dnf clean all
1313

@@ -16,7 +16,7 @@ RUN cargo build --release --bin recert
1616
# runtime stage
1717
FROM registry.redhat.io/rhel9-4-els/rhel-minimal:9.4@sha256:f4c5d46c3f582ecf9eab1f5625bb5200d9ab1cee6ae96160d4877c3d2488a49a AS runtime-image
1818

19-
RUN PKGS="openssh-clients" \
19+
RUN PKGS="openssh-clients libatomic" \
2020
&& microdnf install -y $PKGS \
2121
&& microdnf clean all
2222

.konflux/lock-build/rpms.in.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@ context:
5353
file: Dockerfile
5454
stageName: build-image
5555
packages:
56-
- rust-toolset
56+
- libatomic # libatomic is already installed in the base image on non-x86 architectures, but this needs to be here for the tool to generate a consistent lock file
5757
- protobuf-compiler
58+
- rust-toolset

.konflux/lock-build/rpms.lock.yaml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ arches:
9595
name: rust-std-static
9696
evr: 1.75.0-1.el9
9797
sourcerpm: rust-1.75.0-1.el9.src.rpm
98+
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/aarch64/appstream/os/Packages/r/rust-toolset-1.75.0-1.el9.noarch.rpm
99+
repoid: rhel-9-for-aarch64-appstream-rpms
100+
size: 13082
101+
checksum: sha256:d1b99a3fe42114436dd35ed0010cea12ad5205685dbdb83bd30837715f2b202f
102+
name: rust-toolset
103+
evr: 1.75.0-1.el9
104+
sourcerpm: rust-1.75.0-1.el9.src.rpm
98105
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/aarch64/baseos/os/Packages/b/binutils-2.35.2-43.el9.aarch64.rpm
99106
repoid: rhel-9-for-aarch64-baseos-rpms
100107
size: 5024988
@@ -186,6 +193,13 @@ arches:
186193
name: pkgconf
187194
evr: 1.7.3-10.el9
188195
sourcerpm: pkgconf-1.7.3-10.el9.src.rpm
196+
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/aarch64/baseos/os/Packages/p/pkgconf-m4-1.7.3-10.el9.noarch.rpm
197+
repoid: rhel-9-for-aarch64-baseos-rpms
198+
size: 16054
199+
checksum: sha256:91bafd6e06099451f60288327b275cfcc651822f6145176a157c6b0fa5131e02
200+
name: pkgconf-m4
201+
evr: 1.7.3-10.el9
202+
sourcerpm: pkgconf-1.7.3-10.el9.src.rpm
189203
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/aarch64/baseos/os/Packages/p/pkgconf-pkg-config-1.7.3-10.el9.aarch64.rpm
190204
repoid: rhel-9-for-aarch64-baseos-rpms
191205
size: 12398
@@ -200,20 +214,6 @@ arches:
200214
name: protobuf-compiler
201215
evr: 3.14.0-13.el9
202216
sourcerpm: protobuf-3.14.0-13.el9.src.rpm
203-
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/appstream/os/Packages/r/rust-toolset-1.75.0-1.el9.noarch.rpm
204-
repoid: rhel-9-for-x86_64-appstream-rpms
205-
size: 13082
206-
checksum: sha256:d1b99a3fe42114436dd35ed0010cea12ad5205685dbdb83bd30837715f2b202f
207-
name: rust-toolset
208-
evr: 1.75.0-1.el9
209-
sourcerpm: rust-1.75.0-1.el9.src.rpm
210-
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/p/pkgconf-m4-1.7.3-10.el9.noarch.rpm
211-
repoid: rhel-9-for-x86_64-baseos-rpms
212-
size: 16054
213-
checksum: sha256:91bafd6e06099451f60288327b275cfcc651822f6145176a157c6b0fa5131e02
214-
name: pkgconf-m4
215-
evr: 1.7.3-10.el9
216-
sourcerpm: pkgconf-1.7.3-10.el9.src.rpm
217217
source: []
218218
module_metadata: []
219219
- arch: x86_64
@@ -358,6 +358,13 @@ arches:
358358
name: glibc-minimal-langpack
359359
evr: 2.34-100.el9_4.4
360360
sourcerpm: glibc-2.34-100.el9_4.4.src.rpm
361+
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/l/libatomic-11.4.1-3.el9.x86_64.rpm
362+
repoid: rhel-9-for-x86_64-baseos-rpms
363+
size: 35636
364+
checksum: sha256:7b6bc994985d4c9939e20ac6b1e15d52fa7daffa68ebb4e5d949e0941e3d74a9
365+
name: libatomic
366+
evr: 11.4.1-3.el9
367+
sourcerpm: gcc-11.4.1-3.el9.src.rpm
361368
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/l/libedit-3.1-38.20210216cvs.el9.x86_64.rpm
362369
repoid: rhel-9-for-x86_64-baseos-rpms
363370
size: 109330

.konflux/lock-runtime/rpms.in.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ context:
5353
file: Dockerfile
5454
stageName: runtime-image
5555
packages:
56+
- libatomic # libatomic is already installed in the base image on non-x86 architectures, but this needs to be here for the tool to generate a consistent lock file
5657
- openssh-clients

.konflux/lock-runtime/rpms.lock.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,13 @@ arches:
155155
name: gzip
156156
evr: 1.12-1.el9
157157
sourcerpm: gzip-1.12-1.el9.src.rpm
158+
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/l/libatomic-11.4.1-3.el9.x86_64.rpm
159+
repoid: rhel-9-for-x86_64-baseos-rpms
160+
size: 35636
161+
checksum: sha256:7b6bc994985d4c9939e20ac6b1e15d52fa7daffa68ebb4e5d949e0941e3d74a9
162+
name: libatomic
163+
evr: 11.4.1-3.el9
164+
sourcerpm: gcc-11.4.1-3.el9.src.rpm
158165
- url: https://cdn.redhat.com/content/dist/rhel9/9.4/x86_64/baseos/os/Packages/l/libcbor-0.7.0-5.el9.x86_64.rpm
159166
repoid: rhel-9-for-x86_64-baseos-rpms
160167
size: 60575

0 commit comments

Comments
 (0)