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

Jump to bottom

Update repo file for current repository structure, enforce GPG checks, remove unneeded deps #27

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Update repo file for current repository structure, enforce GPG checks, remove unneeded deps #27

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
3428d3e
Update repository list and enforce signature checks
stormi Aug 24, 2023
812b21a
Drop mock and mercurial from default container
stormi Aug 24, 2023
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
8 changes: 4 additions & 4 deletions Dockerfile-8.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ COPY files/tmp-CentOS-Vault.repo /etc/yum.repos.d/CentOS-Vault-7.5.repo
# Repository file depends on the target version of XCP-ng, and is pre-processed by build.sh
COPY files/tmp-xcp-ng.repo /etc/yum.repos.d/xcp-ng.repo

# Install GPG key
RUN curl -sSf https://xcp-ng.org/RPM-GPG-KEY-xcpng -o /etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng

# Fix invalid rpmdb checksum error with overlayfs, see https://github.com/docker/docker/issues/10180
# (still needed?)
RUN yum install -y yum-plugin-ovl
Expand All @@ -29,8 +32,6 @@ RUN yum install -y \
gcc-c++ \
git \
make \
mercurial \
mock \
rpm-build \
rpm-python \
sudo \
Expand Down Expand Up @@ -61,8 +62,7 @@ RUN bash -c ' \
fi; \
' \
&& echo "builder:builder" | chpasswd \
&& echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers \
&& usermod -G mock builder
&& echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers

RUN mkdir -p /usr/local/bin
COPY files/init-container.sh /usr/local/bin/init-container.sh
Expand Down
79 changes: 63 additions & 16 deletions files/xcp-ng.repo.8.x.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,54 @@
name=XCP-ng Base Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/base/x86_64/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-updates]
name=XCP-ng Updates Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/updates/x86_64/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-candidates]
name=XCP-ng Candidates Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/candidates/x86_64/
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-testing]
name=XCP-ng Testing Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/testing/x86_64/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-ci]
name=XCP-ng CI Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/ci/x86_64/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-staging]
name=XCP-ng Staging Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/staging/x86_64/
[xcp-ng-incoming]
name=XCP-ng Incoming Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/incoming/x86_64/
enabled=0
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

# Source repositories
Expand All @@ -39,33 +58,61 @@ priority=1
name=XCP-ng Base Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/base/Source/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-updates-src]
name=XCP-ng Updates Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/updates/Source/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-candidates-src]
name=XCP-ng Candidates Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/candidates/Source/
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-testing-src]
name=XCP-ng Testing Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/testing/Source/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-ci-src]
name=XCP-ng CI Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/ci/Source/
enabled=1
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-incoming-src]
name=XCP-ng Incoming Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/incoming/Source/
enabled=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1

[xcp-ng-staging-src]
name=XCP-ng Staging Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/staging/Source/
[xcp-ng-lab-src]
name=XCP-ng Lab Source Repository
baseurl=http://mirrors.xcp-ng.org/8/@XCP_NG_BRANCH@/lab/Source/
enabled=0
gpgcheck=0
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng
priority=1
Loading