Skip to content

Commit

Permalink
deps: update osbuild/images to v0.3.0
Browse files Browse the repository at this point in the history 
Bump the required osbuild version to v93 (due to the systemd units
change).

Pin the new osbuild version in Schutzfile.

Update repo snapshots in Schutzfile due to osbuild v93 depending on
new selinux-policy build.
  • Loading branch information
@achilleas-k @thozza
achilleas-k authored and thozza committed Aug 24, 2023
1 parent 715bdba commit d4332f8
Show file tree
Hide file tree
Showing 62 changed files with 1,269 additions and 539 deletions.
94 changes: 47 additions & 47 deletions Schutzfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"fedora-37": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand Down Expand Up @@ -46,14 +46,14 @@
{
"title": "updates",
"name": "updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20230824"
}
],
"aarch64": [
{
"title": "updates",
"name": "updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20230824"
}
]
},
Expand All @@ -63,14 +63,14 @@
{
"title": "updates-modular",
"name": "updates-modular",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20230824"
}
],
"aarch64": [
{
"title": "updates-modular",
"name": "updates-modular",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20230824"
}
]
}
Expand All @@ -79,7 +79,7 @@
"fedora-38": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand Down Expand Up @@ -123,14 +123,14 @@
{
"title": "updates",
"name": "updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-20230824"
}
],
"aarch64": [
{
"title": "updates",
"name": "updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-20230824"
}
]
},
Expand All @@ -140,14 +140,14 @@
{
"title": "updates-modular",
"name": "updates-modular",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-modular-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-modular-20230824"
}
],
"aarch64": [
{
"title": "updates-modular",
"name": "updates-modular",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-modular-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-modular-20230824"
}
]
}
Expand All @@ -156,35 +156,35 @@
"rhel-8.4": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-8.6": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-8.7": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-8.8": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-8.9": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand All @@ -194,34 +194,34 @@
{
"title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230824"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230824"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20230824"
}
],
"aarch64": [
{
"title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20230824"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20230824"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20230824"
}
]
}
Expand All @@ -230,28 +230,28 @@
"rhel-9.0": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-9.1": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-9.2": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"rhel-9.3": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand All @@ -261,34 +261,34 @@
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.3-20230824"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.3-20230824"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.3-20230824"
}
],
"aarch64": [
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.3-20230824"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.3-20230824"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.3-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.3-20230824"
}
]
}
Expand All @@ -297,21 +297,21 @@
"centos-8": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"centos-9": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
}
},
"centos-stream-9": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand All @@ -321,34 +321,34 @@
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20230824"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20230824"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20230824"
}
],
"aarch64": [
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20230824"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20230824"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20230824"
}
]
}
Expand All @@ -357,7 +357,7 @@
"centos-stream-8": {
"dependencies": {
"osbuild": {
"commit": "c90b587dccf5f82e5732b7a264866c3535c066c2"
"commit": "433515cff898168b204833941a6d32399152128b"
}
},
"repos": [
Expand All @@ -367,14 +367,14 @@
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20230824"
}
],
"aarch64": [
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20230824"
}
]
},
Expand All @@ -384,14 +384,14 @@
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20230824"
}
],
"aarch64": [
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20230824"
}
]
},
Expand All @@ -401,14 +401,14 @@
{
"title": "powertools",
"name": "powertools",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20230824"
}
],
"aarch64": [
{
"title": "powertools",
"name": "powertoosl",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20230801"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20230824"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/osbuild-playground/my-container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (img *MyContainer) InstantiateManifest(m *manifest.Manifest,
os.OSCustomizations.Timezone = "UTC"

// create an OCI container containing the OS tree created above
container := manifest.NewOCIContainer(m, build, os)
container := manifest.NewOCIContainer(build, os)
artifact := container.Export()

return artifact, nil
Expand Down
2 changes: 1 addition & 1 deletion cmd/osbuild-playground/my-image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (img *MyImage) InstantiateManifest(m *manifest.Manifest,
os.KernelName = "kernel" // use the default fedora kernel

// create a raw image containing the OS tree created above
raw := manifest.NewRawImage(m, build, os)
raw := manifest.NewRawImage(build, os)
artifact := raw.Export()

return artifact, nil
Expand Down
Loading

0 comments on commit d4332f8

Please sign in to comment.