Skip to content
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

add support for specifying CentOS vault configuration #17

Merged
merged 1 commit into from
Oct 3, 2019
Merged

add support for specifying CentOS vault configuration #17

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
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ supports the following operating systems:
later, may or may not work with other releases.
* CentOS - Requires access to the docker socket, and either (a) privileged
host access or (b) `/config/centos-release` from
`/etc/centos-release`. Tested with CentOS 7, may or may not work
with other releases.
`/etc/centos-release`. You may need to add yum repo configuration
in `/config/centos-vault` to access the right CentOS vault to
find the appropriate packages, if it's an older kernel. Tested
with CentOS 7, may or may not work with other releases.
* Vanilla - Requires either (a) `/proc/config.gz` to be present, or
`/config/config.gz` to be present with the kernel configuration.
Optionally can specify the kernel source with `-v path:/src/linux`,
Expand Down
23 changes: 21 additions & 2 deletions src/centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,21 @@
# If this wasn't enough, CentOS requires a customized version of GCC that is not available
# in the stock Ubuntu gcc images. So we can't run the actual build from within
# our container, but instead run the whole build process via centos-build.
# within the container. This of course presents an additional challenge that
# while we could run
# within the container.
#
# Finally, CentOS is aggressive about moving older kernel versions to their "vault"
# repos. Because of this, we allow the "centos-vault" file in the config to specify
# content that should replace /etc/yum.repos.d/CentOS-Vault.repo, such as:
#
# [C7.6.1810]
# name=CentOS-7.6.1810
# baseurl=http://vault.centos.org/7.6.1810/updates/$basearch/
# gpgcheck=1
# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
# enabled=1
#
# This allows tools that invoke the builder to indicate where exactly to find
# the centos packages.
#
function build() {
local centos_release
Expand All @@ -35,6 +48,11 @@ function build() {

mkdir /docker
cp /*.sh /docker
if [[ -f /config/centos-vault ]]; then
cp /config/centos-vault /docker
else
touch /docker/centos-vault
fi
cat > /docker/Dockerfile <<EOF
FROM centos:centos$centos_version
RUN yum install -y gcc git
Expand All @@ -43,6 +61,7 @@ RUN yum install -y zlib-devel libuuid-devel libattr-devel libblkid-devel libseli
RUN yum install -y libacl-devel libaio-devel device-mapper-devel openssl-devel libtirpc-devel elfutils-libelf-devel
RUN yum install -y epel-release
COPY *.sh /
COPY centos-vault /etc/yum.repos.d/CentOS-Vault.repo
CMD /centos-build.sh
EOF
local image_name=zfs-builder-centos:$(generate_random_string 8)
Expand Down