Skip to content

Commit 74991b9

Browse files
author
Petr Matousek
committed
fix: Remove COPR repositories and use EPEL packages
- Remove kvanderr COPR repositories (internal/subscription-only) - Rely on EPEL packages for opentelemetry-cpp and dependencies - Simplified Dockerfile setup by removing COPR configuration - EPEL should provide the necessary packages for public CI builds
1 parent 4f6d27a commit 74991b9

File tree

4 files changed

+3
-21
lines changed

4 files changed

+3
-21
lines changed

Dockerfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ RUN rpm -ivh epel-release-latest-9.noarch.rpm
1717
RUN dnf install -y 'dnf-command(config-manager)'
1818
RUN /usr/bin/crb enable
1919

20-
RUN dnf install -y 'dnf-command(copr)' \
21-
&& dnf copr enable -y kvanderr/rh-opentelemetry-cpp \
22-
&& dnf copr enable -y kvanderr/rh-protobuf \
23-
&& dnf copr enable -y kvanderr/rh-json
24-
2520
#CMake Error at /usr/lib64/cmake/protobuf/protobuf-targets.cmake:106 (message):
2621
# The imported target "protobuf::libprotobuf-lite" references the file
2722
#
@@ -84,11 +79,6 @@ RUN rpm -ivh epel-release-latest-9.noarch.rpm
8479
RUN dnf install -y 'dnf-command(config-manager)'
8580
RUN /usr/bin/crb enable
8681

87-
RUN dnf install -y 'dnf-command(copr)' \
88-
&& dnf copr enable -y kvanderr/rh-opentelemetry-cpp \
89-
&& dnf copr enable -y kvanderr/rh-protobuf \
90-
&& dnf copr enable -y kvanderr/rh-json
91-
9282
RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \
9383
protobuf-lite \
9484
opentelemetry-cpp opentelemetry-cpp-exporter-otlp opentelemetry-cpp-zpages \

Dockerfile.fedora37_epel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM docker.io/library/fedora:37
22

3-
RUN dnf install -y 'dnf-command(copr)' \
4-
&& dnf copr enable -y kvanderr/rh-opentelemetry-cpp \
5-
&& dnf install -y \
3+
RUN dnf install -y \
64
npm \
75
\
86
cmake \

Dockerfile.ubi8_epel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM docker.io/almalinux/8-base
22

3-
RUN dnf install -y 'dnf-command(copr)' \
4-
&& dnf copr enable -y kvanderr/rh-opentelemetry-cpp \
5-
&& yum install -y dnf \
3+
RUN yum install -y dnf \
64
&& dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
75
&& dnf install -y \
86
npm \

Dockerfile.ubi8_upstream

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
FROM docker.io/almalinux/8-base
44

5-
RUN dnf install -y 'dnf-command(copr)' \
6-
&& dnf copr enable -y kvanderr/rh-json \
7-
&& dnf copr enable -y kvanderr/rh-protobuf \
8-
&& dnf copr enable -y kvanderr/rh-opentelemetry-cpp \
9-
&& yum install -y dnf \
5+
RUN yum install -y dnf \
106
&& dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
117
&& dnf install -y \
128
npm \

0 commit comments

Comments
 (0)