Skip to content

rpm: add support for building on CentOS 8 #148

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

Merged
silvin-lubecki merged 2 commits into from
Mar 24, 2020
Merged

rpm: add support for building on CentOS 8 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4e8ab
rpm: remove obsolete sed for aarch64 repositories
thaJeztah Mar 23, 2020
6b278d4
rpm: add support for building on CentOS 8
thaJeztah Mar 23, 2020
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
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
def images = [
[image: "amazonlinux:2", arches: ["aarch64"]],
[image: "centos:7", arches: ["amd64", "aarch64", "armhf"]],
[image: "centos:8", arches: ["amd64", "aarch64"]], // Note: armhf (arm32) images are currently not available on Docker Hub
[image: "debian:stretch", arches: ["amd64", "aarch64", "armhf"]], // Debian 9 (EOL: June, 2022)
[image: "debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024)
[image: "fedora:29", arches: ["amd64", "aarch64"]],
Expand Down
3 changes: 1 addition & 2 deletions dockerfiles/rpm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ FROM redhat-base AS rhel-base
ENV BUILDTAGS=no_btrfs

FROM redhat-base AS centos-base
# Overwrite repo that was failing on aarch64
RUN sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo
RUN if [ -f /etc/yum.repos.d/CentOS-PowerTools.repo ]; then sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-PowerTools.repo; fi

FROM redhat-base AS amzn-base

Expand Down
7 changes: 6 additions & 1 deletion rpm/containerd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,12 @@ cd %{_topdir}/BUILD
make man

pushd /go/src/%{import_path}
%define make_containerd(o:) make VERSION=%{getenv:VERSION} REVISION=%{getenv:REF} PACKAGE=%{getenv:PACKAGE} %{?**};
BUILDTAGS="seccomp selinux"
%if 1%{!?el8:1}
BUILDTAGS="${BUILDTAGS} no_btrfs"
%endif

%define make_containerd(o:) make VERSION=%{getenv:VERSION} REVISION=%{getenv:REF} PACKAGE=%{getenv:PACKAGE} GO_BUILDTAGS="${BUILDTAGS}" %{?**};
%make_containerd bin/containerd
/go/src/%{import_path}/bin/containerd --version
%make_containerd bin/containerd-shim
Expand Down