Skip to content

Commit 8335f54

Browse files
thozzathozza
committed
go.mod: update osbuild/images to v0.202.0
Also bump the minimum required osbuild version to v160 and update rpmrepo snapshots due to selinux policy dependency. Signed-off-by: Tomáš Hozza <[email protected]>
1 parent a0232da commit 8335f54

File tree

22 files changed

+172
-95
lines changed

22 files changed

+172
-95
lines changed

‎Schutzfile‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"fedora-41": {
33
"dependencies": {
44
"osbuild": {
5-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
5+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
66
}
77
},
88
"repos": [
@@ -29,14 +29,14 @@
2929
{
3030
"title": "updates",
3131
"name": "updates",
32-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-updates-released-20250825"
32+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-updates-released-20251001"
3333
}
3434
],
3535
"aarch64": [
3636
{
3737
"title": "updates",
3838
"name": "updates",
39-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-updates-released-20250825"
39+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-updates-released-20251001"
4040
}
4141
]
4242
}
@@ -45,7 +45,7 @@
4545
"fedora-42": {
4646
"dependencies": {
4747
"osbuild": {
48-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
48+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
4949
}
5050
},
5151
"repos": [
@@ -72,14 +72,14 @@
7272
{
7373
"title": "updates",
7474
"name": "updates",
75-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-updates-released-20250825"
75+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-updates-released-20251001"
7676
}
7777
],
7878
"aarch64": [
7979
{
8080
"title": "updates",
8181
"name": "updates",
82-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-updates-released-20250825"
82+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-updates-released-20251001"
8383
}
8484
]
8585
}
@@ -88,70 +88,70 @@
8888
"rhel-8.4": {
8989
"dependencies": {
9090
"osbuild": {
91-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
91+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
9292
}
9393
}
9494
},
9595
"rhel-8.8": {
9696
"dependencies": {
9797
"osbuild": {
98-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
98+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
9999
}
100100
}
101101
},
102102
"rhel-8.9": {
103103
"dependencies": {
104104
"osbuild": {
105-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
105+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
106106
}
107107
}
108108
},
109109
"rhel-8.10": {
110110
"dependencies": {
111111
"osbuild": {
112-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
112+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
113113
}
114114
}
115115
},
116116
"rhel-9.2": {
117117
"dependencies": {
118118
"osbuild": {
119-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
119+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
120120
}
121121
}
122122
},
123123
"rhel-9.3": {
124124
"dependencies": {
125125
"osbuild": {
126-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
126+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
127127
}
128128
}
129129
},
130130
"rhel-9.4": {
131131
"dependencies": {
132132
"osbuild": {
133-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
133+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
134134
}
135135
}
136136
},
137137
"rhel-9.5": {
138138
"dependencies": {
139139
"osbuild": {
140-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
140+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
141141
}
142142
}
143143
},
144144
"rhel-9.6": {
145145
"dependencies": {
146146
"osbuild": {
147-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
147+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
148148
}
149149
}
150150
},
151151
"rhel-9.7": {
152152
"dependencies": {
153153
"osbuild": {
154-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
154+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
155155
}
156156
},
157157
"repos": [
@@ -161,34 +161,34 @@
161161
{
162162
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
163163
"name": "baseos",
164-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.7-20250825"
164+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.7-20251001"
165165
},
166166
{
167167
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
168168
"name": "appstream",
169-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.7-20250825"
169+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.7-20251001"
170170
},
171171
{
172172
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
173173
"name": "crb",
174-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.7-20250825"
174+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.7-20251001"
175175
}
176176
],
177177
"aarch64": [
178178
{
179179
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
180180
"name": "baseos",
181-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.7-20250825"
181+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.7-20251001"
182182
},
183183
{
184184
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
185185
"name": "appstream",
186-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.7-20250825"
186+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.7-20251001"
187187
},
188188
{
189189
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
190190
"name": "crb",
191-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.7-20250825"
191+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.7-20251001"
192192
}
193193
]
194194
}
@@ -197,14 +197,14 @@
197197
"rhel-10.0": {
198198
"dependencies": {
199199
"osbuild": {
200-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
200+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
201201
}
202202
}
203203
},
204204
"rhel-10.1": {
205205
"dependencies": {
206206
"osbuild": {
207-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
207+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
208208
}
209209
},
210210
"repos": [
@@ -214,34 +214,34 @@
214214
{
215215
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
216216
"name": "baseos",
217-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20250825"
217+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20251001"
218218
},
219219
{
220220
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
221221
"name": "appstream",
222-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20250825"
222+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20251001"
223223
},
224224
{
225225
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
226226
"name": "crb",
227-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20250825"
227+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20251001"
228228
}
229229
],
230230
"aarch64": [
231231
{
232232
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
233233
"name": "baseos",
234-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20250825"
234+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20251001"
235235
},
236236
{
237237
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
238238
"name": "appstream",
239-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20250825"
239+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20251001"
240240
},
241241
{
242242
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
243243
"name": "crb",
244-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20250825"
244+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20251001"
245245
}
246246
]
247247
}
@@ -250,14 +250,14 @@
250250
"centos-9": {
251251
"dependencies": {
252252
"osbuild": {
253-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
253+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
254254
}
255255
}
256256
},
257257
"centos-stream-9": {
258258
"dependencies": {
259259
"osbuild": {
260-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
260+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
261261
}
262262
},
263263
"repos": [
@@ -267,34 +267,34 @@
267267
{
268268
"title": "baseos",
269269
"name": "baseos",
270-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20250825"
270+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20251001"
271271
},
272272
{
273273
"title": "appstream",
274274
"name": "appstream",
275-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20250825"
275+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20251001"
276276
},
277277
{
278278
"title": "crb",
279279
"name": "crb",
280-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20250825"
280+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20251001"
281281
}
282282
],
283283
"aarch64": [
284284
{
285285
"title": "baseos",
286286
"name": "baseos",
287-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20250825"
287+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20251001"
288288
},
289289
{
290290
"title": "appstream",
291291
"name": "appstream",
292-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20250825"
292+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20251001"
293293
},
294294
{
295295
"title": "crb",
296296
"name": "crb",
297-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20250825"
297+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20251001"
298298
}
299299
]
300300
}
@@ -303,14 +303,14 @@
303303
"centos-10": {
304304
"dependencies": {
305305
"osbuild": {
306-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
306+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
307307
}
308308
}
309309
},
310310
"centos-stream-10": {
311311
"dependencies": {
312312
"osbuild": {
313-
"commit": "e3236a8b34e86712463130ba8edc6a8707c7ed0d"
313+
"commit": "0cd3320f9a53ad4f4fc35a1aa7003ec0a79f4ba2"
314314
}
315315
},
316316
"repos": [
@@ -320,34 +320,34 @@
320320
{
321321
"title": "baseos",
322322
"name": "baseos",
323-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-baseos-20250825"
323+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-baseos-20251001"
324324
},
325325
{
326326
"title": "appstream",
327327
"name": "appstream",
328-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-appstream-20250825"
328+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-appstream-20251001"
329329
},
330330
{
331331
"title": "crb",
332332
"name": "crb",
333-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-crb-20250825"
333+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-crb-20251001"
334334
}
335335
],
336336
"aarch64": [
337337
{
338338
"title": "baseos",
339339
"name": "baseos",
340-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-baseos-20250825"
340+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-baseos-20251001"
341341
},
342342
{
343343
"title": "appstream",
344344
"name": "appstream",
345-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-appstream-20250825"
345+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-appstream-20251001"
346346
},
347347
{
348348
"title": "crb",
349349
"name": "crb",
350-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-crb-20250825"
350+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-crb-20251001"
351351
}
352352
]
353353
}

‎cmd/osbuild-worker/jobimpl-osbuild.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
701701
}
702702
}
703703

704-
ami, _, err := a.Register(jobTarget.ImageName, bucket, targetOptions.Key, targetOptions.ShareWithAccounts, arch.Current(), bootMode, nil)
704+
ami, _, err := a.Register(jobTarget.ImageName, bucket, targetOptions.Key, nil, targetOptions.ShareWithAccounts, arch.Current(), bootMode, nil)
705705
if err != nil {
706706
targetResult.TargetError = clienterrors.New(clienterrors.ErrorImportingImage, err.Error(), nil)
707707
break

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/oapi-codegen/runtime v1.1.2
3535
github.com/openshift-online/ocm-sdk-go v0.1.477
3636
github.com/osbuild/blueprint v1.13.0
37-
github.com/osbuild/images v0.199.0
37+
github.com/osbuild/images v0.202.0
3838
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
3939
github.com/prometheus/client_golang v1.23.2
4040
github.com/segmentio/ksuid v1.0.4

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch
520520
github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
521521
github.com/osbuild/blueprint v1.13.0 h1:blo22+S2ZX5bBmjGcRveoTUrV4Ms7kLfKyb32WyuymA=
522522
github.com/osbuild/blueprint v1.13.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
523-
github.com/osbuild/images v0.199.0 h1:WPka77gDdiZZwa9wedj9nxJtW/glVDMigKLCxS4kqr8=
524-
github.com/osbuild/images v0.199.0/go.mod h1:xkXfw5CIy0bVNTNdB6GXiewu/IzBgpofkItDJPAzGA4=
523+
github.com/osbuild/images v0.202.0 h1:OPvfmr5RJHcOJgU8Win6kHyoCNQZEiILlgIDI64/YIM=
524+
github.com/osbuild/images v0.202.0/go.mod h1:xkXfw5CIy0bVNTNdB6GXiewu/IzBgpofkItDJPAzGA4=
525525
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
526526
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
527527
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=

‎osbuild-composer.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%bcond_with relax_requires
99

1010
# The minimum required osbuild version
11-
%global min_osbuild_version 157
11+
%global min_osbuild_version 160
1212

1313
%global goipath github.com/osbuild/osbuild-composer
1414

‎vendor/github.com/osbuild/images/data/dependencies/osbuild‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)