Skip to content

Commit 7aac149

Browse files
Add Fedora 45.
We have to add the usage of the --nosignature flag as now rpm >= 6 prevents installation by default of rpms files without signature. During the verification process, we have a locally build rpm, not signed yet, so accept the absence of signature in that case. See https://fedoraproject.org/wiki/Changes/Enforcing_signature_checking_by_default Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
1 parent d5d6901 commit 7aac149

14 files changed

Lines changed: 27 additions & 13 deletions

File tree

‎docker-bake.hcl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ variable "DISTROS" {
3030
"centos10",
3131
"fedora43",
3232
"fedora44",
33+
"fedora45",
3334
"oraclelinux8",
3435
"oraclelinux9",
3536
"oraclelinux10",
@@ -392,6 +393,18 @@ target "_distro-fedora44" {
392393
}
393394
}
394395

396+
target "_distro-fedora45" {
397+
args = {
398+
DISTRO_NAME = "fedora45"
399+
DISTRO_TYPE = "rpm"
400+
DISTRO_RELEASE = "fedora"
401+
DISTRO_ID = "45"
402+
DISTRO_SUITE = "45"
403+
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "fedora:45"
404+
TEST_ONLY = "0"
405+
}
406+
}
407+
395408
target "_distro-oraclelinux8" {
396409
args = {
397410
DISTRO_NAME = "oraclelinux8"
@@ -525,6 +538,7 @@ function "distroPlatforms" {
525538
centos10 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
526539
fedora43 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
527540
fedora44 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
541+
fedora45 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
528542
oraclelinux8 = ["linux/amd64", "linux/arm64"]
529543
oraclelinux9 = ["linux/amd64", "linux/arm64"]
530544
oraclelinux10 = ["linux/amd64", "linux/arm64"]

‎pkg/agent/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fi
7070

7171
set -x
7272

73-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
73+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
7474
mkdir -p "${pkgoutput}"
7575
cp ./RPMS/*/*.* "${pkgoutput}"/
7676
if [ "$(ls -A ./SRPMS)" ]; then

‎pkg/agent/verify.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
8080
(
8181
set -x
8282
rpm -qilp $package
83-
rpm --install --nodeps $package
83+
rpm --install --nodeps --nosignature $package
8484
)
8585
done
8686
set -x

‎pkg/buildx/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fi
7272

7373
set -x
7474

75-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
75+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
7676
mkdir -p "${pkgoutput}"
7777
cp ./RPMS/*/*.* "${pkgoutput}"/
7878
if [ "$(ls -A ./SRPMS)" ]; then

‎pkg/buildx/verify.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
8080
(
8181
set -x
8282
rpm -qilp $package
83-
rpm --install --nodeps $package
83+
rpm --install --nodeps --nosignature $package
8484
)
8585
done
8686
set -x

‎pkg/compose/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fi
7272

7373
set -x
7474

75-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
75+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
7676
mkdir -p "${pkgoutput}"
7777
cp ./RPMS/*/*.* "${pkgoutput}"/
7878
if [ "$(ls -A ./SRPMS)" ]; then

‎pkg/compose/verify.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
8080
(
8181
set -x
8282
rpm -qilp $package
83-
rpm --install --nodeps $package
83+
rpm --install --nodeps --nosignature $package
8484
)
8585
done
8686
set -x

‎pkg/containerd/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ set -x
8080

8181
sed 's#/usr/local/bin/containerd#/usr/bin/containerd#g' "${SRCDIR}/containerd.service" > /root/rpmbuild/SOURCES/containerd.service
8282

83-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
83+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
8484
mkdir -p "${pkgoutput}"
8585
cp ./RPMS/*/*.* "${pkgoutput}"/
8686
if [ "$(ls -A ./SRPMS)" ]; then

‎pkg/credential-helpers/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fi
7272

7373
set -x
7474

75-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
75+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
7676
mkdir -p "${pkgoutput}"
7777
cp ./RPMS/*/*.* "${pkgoutput}"/
7878
if [ "$(ls -A ./SRPMS)" ]; then

‎pkg/docker-cli/scripts/pkg-rpm-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fi
7272

7373
set -x
7474

75-
rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
75+
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
7676
mkdir -p "${pkgoutput}"
7777
cp ./RPMS/*/*.* "${pkgoutput}"/
7878
if [ "$(ls -A ./SRPMS)" ]; then

0 commit comments

Comments
 (0)