Skip to content

Add Fedora 45. #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Romain-Geissler-1A wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Fedora 45. #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ variable "DISTROS" {
"centos10",
"fedora43",
"fedora44",
"fedora45",
"oraclelinux8",
"oraclelinux9",
"oraclelinux10",
Expand Down Expand Up @@ -392,6 +393,18 @@ target "_distro-fedora44" {
}
}

target "_distro-fedora45" {
args = {
DISTRO_NAME = "fedora45"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "fedora"
DISTRO_ID = "45"
DISTRO_SUITE = "45"
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "fedora:45"
TEST_ONLY = "0"
}
}

target "_distro-oraclelinux8" {
args = {
DISTRO_NAME = "oraclelinux8"
Expand Down Expand Up @@ -525,6 +538,7 @@ function "distroPlatforms" {
centos10 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
fedora43 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
fedora44 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
fedora45 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
oraclelinux8 = ["linux/amd64", "linux/arm64"]
oraclelinux9 = ["linux/amd64", "linux/arm64"]
oraclelinux10 = ["linux/amd64", "linux/arm64"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
(
set -x
rpm -qilp $package
rpm --install --nodeps $package
rpm --install --nodeps --nosignature $package
)
done
set -x
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
(
set -x
rpm -qilp $package
rpm --install --nodeps $package
rpm --install --nodeps --nosignature $package
)
done
set -x
Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
(
set -x
rpm -qilp $package
rpm --install --nodeps $package
rpm --install --nodeps --nosignature $package
)
done
set -x
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ set -x

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

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/credential-helpers/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RUN --mount=from=bin,target=/build <<EOT
(
set -x
rpm -qilp $package
rpm --install --nodeps $package
rpm --install --nodeps --nosignature $package
)
done
case "$DISTRO_NAME" in
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fi

set -x

rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
rpmbuild --nosignature --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec
mkdir -p "${pkgoutput}"
cp ./RPMS/*/*.* "${pkgoutput}"/
if [ "$(ls -A ./SRPMS)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN --mount=from=bin,target=/build <<EOT
(
set -x
rpm -qilp $package
rpm --install --nodeps $package
rpm --install --nodeps --nosignature $package
)
done
set -x
Expand Down
Loading