Skip to content

[main] rpm: minimal RHEL support (carry #342) #381

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
thaJeztah merged 2 commits into from
Jul 23, 2024
Merged

[main] rpm: minimal RHEL support (carry #342) #381

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
58d04e2
Make build ARCH-aware
neersighted Feb 22, 2024
29bfe29
rpm: minimal RHEL support
neersighted Feb 22, 2024
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
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ def generatePackageStep(opts, arch) {
sh 'make clean'
}
stage("build") {
sh "make CREATE_ARCHIVE=1 ${opts.image}"
sh "make CREATE_ARCHIVE=1 ARCH=${arch} ${opts.image}"
archiveArtifacts(artifacts: 'archive/*.tar.gz', onlyIfSuccessful: true)
}
stage("build-main") {
// We're not archiving these builds as they have the same name
// as the 1.7 builds, so would replace those. We're building
// the main branch to verify that the scripts work for main (2.0)
sh "make REF=main ${opts.image}"
sh "make REF=main ARCH=${arch} ${opts.image}"
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

include common/common.mk

ARCH=$(shell uname -m)
BUILD_IMAGE=ubuntu:focal
BUILD_TYPE=$(shell ./scripts/deb-or-rpm $(BUILD_IMAGE))
BUILD_BASE=$(shell ./scripts/determine-base $(BUILD_IMAGE))
Expand Down Expand Up @@ -84,7 +85,7 @@ build:
@echo ""
@echo "containerd : $(REF) (commit: $(shell git -C "src/github.com/containerd/containerd" log -1 --pretty='%h'))"
@echo "runc : $$(./scripts/determine-runc-version) (commit: $$(git -C "src/github.com/opencontainers/runc" log -1 --pretty='%h'))"
@echo "architecture : $(shell uname -m)"
@echo "architecture : $(ARCH)"
@echo "build image : $(BUILD_IMAGE)"
@echo "golang image : $(GOLANG_IMAGE)"
@echo "--------------------------------------------------------------------"
Expand All @@ -96,6 +97,9 @@ build:

@set -x; DOCKER_BUILDKIT=1 docker build \
--pull \
--secret id=rh-user,env=RH_USER \
--secret id=rh-pass,env=RH_PASS \
--platform linux/$(ARCH) \
--build-arg GOLANG_IMAGE="$(GOLANG_IMAGE)" \
--build-arg BUILD_IMAGE="$(BUILD_IMAGE)" \
--build-arg BASE="$(BUILD_BASE)" \
Expand Down
13 changes: 13 additions & 0 deletions dockerfiles/rpm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ FROM ${BUILD_IMAGE} AS redhat-base
RUN dnf install -y rpm-build git dnf-plugins-core

FROM redhat-base AS rhel-base
RUN --mount=type=secret,id=rh-user --mount=type=secret,id=rh-pass <<-EOT
rm -f /etc/rhsm-host

if [ ! -f /run/secrets/rh-user ] || [ ! -f /run/secrets/rh-pass ]; then
echo "Either RH_USER or RH_PASS is not set. Running build without subscription."
else
subscription-manager register \
--username="$(cat /run/secrets/rh-user)" \
--password="$(cat /run/secrets/rh-pass)"

subscription-manager repos --enable codeready-builder-for-rhel-$(source /etc/os-release && echo "${VERSION_ID%.*}"-$(arch)-rpms)
fi
EOT

FROM redhat-base AS centos-base
RUN dnf config-manager --set-enabled crb
Expand Down