Skip to content

Commit b862672

Browse files
ysokysok
committed
Remove EPEL
1 parent c08d35a commit b862672

File tree

10 files changed

+13
-173
lines changed

10 files changed

+13
-173
lines changed

‎codeserver/ubi9-python-3.12/Dockerfile.cpu‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,11 @@ ARG CODESERVER_VERSION=v4.106.3
5757

5858
# [HERMETIC] Import GPG keys for prefetched RPM verification.
5959
# CentOS key needed because libX11-devel comes from CentOS Stream repos.
60-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
6160
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
6261
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
6362

6463
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
65-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
64+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
6665
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
6766
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
6867
rm -f /etc/yum.repos.d/* && \
@@ -167,11 +166,10 @@ ARG LOCAL_BUILD
167166
ARG CODESERVER_SOURCE_CODE=codeserver/ubi9-python-3.12
168167
ARG PYLOCK_FLAVOR
169168

170-
# [HERMETIC] Import GPG keys for EPEL, Red Hat, and CentOS repos (needed for dnf to verify prefetched RPMs).
171-
# EPEL + CentOS keys are prefetched as generic artifacts (see artifacts.in.yaml).
169+
# [HERMETIC] Import GPG keys for Red Hat and CentOS repos (needed for dnf to verify prefetched RPMs).
170+
# CentOS key is prefetched as a generic artifact (see artifacts.in.yaml).
172171
# UBI9 images only ship the Red Hat key; CentOS key is needed for ppc64le/s390x packages
173172
# from CentOS Stream repos (mesa-libGL, etc.).
174-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
175173
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
176174
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
177175

@@ -251,12 +249,11 @@ USER 0
251249

252250
# [HERMETIC] Import GPG keys for prefetched RPM verification.
253251
# CentOS key needed because mesa-libGL comes from CentOS Stream repos.
254-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
255252
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
256253
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
257254

258255
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
259-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
256+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
260257
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
261258
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
262259
rm -f /etc/yum.repos.d/* && \
@@ -327,7 +324,7 @@ USER 0
327324
WORKDIR /opt/app-root/bin
328325

329326
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
330-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
327+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
331328
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
332329
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
333330
rm -f /etc/yum.repos.d/* && \

‎codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,11 @@ ARG CODESERVER_VERSION=v4.106.3
5757

5858
# [HERMETIC] Import GPG keys for prefetched RPM verification.
5959
# CentOS key needed because libX11-devel comes from CentOS Stream repos.
60-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
6160
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
6261
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
6362

6463
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
65-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
64+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
6665
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
6766
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
6867
rm -f /etc/yum.repos.d/* && \
@@ -167,11 +166,10 @@ ARG LOCAL_BUILD
167166
ARG CODESERVER_SOURCE_CODE=codeserver/ubi9-python-3.12
168167
ARG PYLOCK_FLAVOR
169168

170-
# [HERMETIC] Import GPG keys for EPEL, Red Hat, and CentOS repos (needed for dnf to verify prefetched RPMs).
171-
# EPEL + CentOS keys are prefetched as generic artifacts (see artifacts.in.yaml).
169+
# [HERMETIC] Import GPG keys for Red Hat and CentOS repos (needed for dnf to verify prefetched RPMs).
170+
# CentOS key is prefetched as a generic artifact (see artifacts.in.yaml).
172171
# UBI9 images only ship the Red Hat key; CentOS key is needed for ppc64le/s390x packages
173172
# from CentOS Stream repos (mesa-libGL, etc.).
174-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
175173
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
176174
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
177175

@@ -251,12 +249,11 @@ USER 0
251249

252250
# [HERMETIC] Import GPG keys for prefetched RPM verification.
253251
# CentOS key needed because mesa-libGL comes from CentOS Stream repos.
254-
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-EPEL-9
255252
RUN rpm --import /cachi2/output/deps/generic/RPM-GPG-KEY-CentOS-Official
256253
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
257254

258255
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
259-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
256+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
260257
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
261258
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
262259
rm -f /etc/yum.repos.d/* && \
@@ -325,7 +322,7 @@ USER 0
325322
WORKDIR /opt/app-root/bin
326323

327324
# [HERMETIC] Configure package repos: local hermeto repos for testing, or enable nodejs:22 module for Konflux.
328-
# Hermeto organises RPMs into per-arch sub-repos (baseos, epel, crb, ubi-*, …), each with
325+
# Hermeto organises RPMs into per-arch sub-repos (baseos, crb, ubi-*, …), each with
329326
# its own repodata/. The generated hermeto.repo already points at the correct file:// paths.
330327
RUN if [ "${LOCAL_BUILD}" = "true" ]; then \
331328
rm -f /etc/yum.repos.d/* && \

‎codeserver/ubi9-python-3.12/prefetch-input/odh/AIPCC-nfpm-RPM-request.md‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎codeserver/ubi9-python-3.12/prefetch-input/odh/artifacts.in.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
# They are stored at /cachi2/output/deps/generic/<filename>. The corresponding lock file (artifacts.lock.yaml)
66
# is auto-generated and contains integrity hashes for each URL.
77

8-
input:
9-
# GPG keys for verifying prefetched RPM packages
10-
- url: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9
8+
input:
119
# CentOS Stream 9 GPG key (needed in whl-cache stage for ppc64le/s390x dnf install
1210
# from CentOS baseos/appstream/crb repos; UBI9 images only ship the Red Hat key)
1311
- url: https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official

‎codeserver/ubi9-python-3.12/prefetch-input/odh/artifacts.lock.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
metadata:
33
version: '1.0'
44
artifacts:
5-
- download_url: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9
6-
checksum: sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
7-
filename: RPM-GPG-KEY-EPEL-9
85
- download_url: https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
96
checksum: sha256:146059788b214d7ba0dd70c1cf21111e594c6cfde201da8a9a88fe7101be8a78
107
filename: RPM-GPG-KEY-CentOS-Official

‎codeserver/ubi9-python-3.12/prefetch-input/patches/code-server-v4.106.3/ci/build/build-vscode.sh‎

100644100755
File mode changed.

‎codeserver/ubi9-python-3.12/prefetch-input/patches/code-server-v4.106.3/custom-packages/README.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎codeserver/ubi9-python-3.12/prefetch-input/patches/code-server-v4.106.3/ripgrep/VERIFICATION.md‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎codeserver/ubi9-python-3.12/prefetch-input/rhds/artifacts.in.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
# They are stored at /cachi2/output/deps/generic/<filename>. The corresponding lock file (artifacts.lock.yaml)
66
# is auto-generated and contains integrity hashes for each URL.
77

8-
input:
9-
# GPG keys for verifying prefetched RPM packages
10-
- url: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9
8+
input:
119
# CentOS Stream 9 GPG key (needed in whl-cache stage for ppc64le/s390x dnf install
1210
# from CentOS baseos/appstream/crb repos; UBI9 images only ship the Red Hat key)
1311
- url: https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official

‎codeserver/ubi9-python-3.12/prefetch-input/rhds/artifacts.lock.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
metadata:
33
version: '1.0'
44
artifacts:
5-
- download_url: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9
6-
checksum: sha256:fcf0eab4f05a1c0de6363ac4b707600a27a9d774e9b491059e59e6921b255a84
7-
filename: RPM-GPG-KEY-EPEL-9
85
- download_url: https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
96
checksum: sha256:146059788b214d7ba0dd70c1cf21111e594c6cfde201da8a9a88fe7101be8a78
107
filename: RPM-GPG-KEY-CentOS-Official
@@ -27,7 +24,7 @@ artifacts:
2724
checksum: sha256:670494f0cc674059596222c60e5db84fbe80c849d7ffb1c3fbd20e4f55b8ea85
2825
filename: node-v22.22.0-headers.tar.gz
2926
- download_url: https://github.com/electron/electron/releases/download/v37.7.0/electron-v37.7.0-linux-x64.zip
30-
checksum: sha256:4ae04d20d0ea25bf3451e3d0eaa757190b5813fa58d17bbe3be4332836da6b25
27+
checksum: sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
3128
filename: electron-v37.7.0-linux-x64.zip
3229
- download_url: https://github.com/electron/electron/releases/download/v37.7.0/electron-v37.7.0-linux-arm64.zip
3330
checksum: sha256:c72c2e963dcdea65d500b23fff3f22806a2518a86b52236dceb825a1d194cd7e

0 commit comments

Comments
 (0)