From 2eed44265e15ce15d9abf00c4b774887e9b6e620 Mon Sep 17 00:00:00 2001 From: Vicente Zepeda Mas Date: Tue, 5 Apr 2022 19:19:27 +0200 Subject: [PATCH] Fixing build issue referenced in #51 (#52) - Only changes base image to fedora:37 Signed-off-by: Vicente Zepeda Mas --- Dockerfile | 9 +++++---- image_resources/centos8-appstream.repo | 2 +- image_resources/centos8.repo | 5 +++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 image_resources/centos8.repo diff --git a/Dockerfile b/Dockerfile index 76d1b57..715490d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM registry.access.redhat.com/ubi8:latest +FROM fedora:37 -COPY image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo -RUN dnf install -y --nodocs python3 python3-pip && dnf clean all && \ - dnf install -y --nodocs skopeo redis curl --enablerepo=centos8-appstream && dnf clean all && \ +COPY image_resources/centos8.repo image_resources/centos8-appstream.repo /etc/yum.repos.d/ +RUN dnf install -y --nodocs python3 python3-pip python3-devel gcc && dnf clean all && \ + dnf install -y --nodocs skopeo curl redis --enablerepo=centos8-appstream && dnf clean all && \ ln -s /usr/bin/python3 /usr/bin/python WORKDIR /workdir @@ -15,6 +15,7 @@ RUN curl -L -o ocm-load-test-linux.tgz \ chmod 755 /usr/local/bin/ocm-load-test COPY config.example.yaml /workdir/config.yaml +RUN pip3 install --upgrade pip RUN pip3 install -r requirements.txt CMD [ "ocm-load-test", "--config-file", "config.yaml" ] \ No newline at end of file diff --git a/image_resources/centos8-appstream.repo b/image_resources/centos8-appstream.repo index 2c926f6..1e4be4a 100644 --- a/image_resources/centos8-appstream.repo +++ b/image_resources/centos8-appstream.repo @@ -1,5 +1,5 @@ [centos8-appstream] name=CentOS-8-Appstream -baseurl=http://mirror.centos.org/centos/8/AppStream/$basearch/os/ +baseurl=http://mirror.centos.org/centos/8-stream/AppStream/$basearch/os/ enabled=0 gpgcheck=0 \ No newline at end of file diff --git a/image_resources/centos8.repo b/image_resources/centos8.repo new file mode 100644 index 0000000..a0ce9ff --- /dev/null +++ b/image_resources/centos8.repo @@ -0,0 +1,5 @@ +[centos8] +name=CentOS-8 +baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/$basearch/os/ +enabled=0 +gpgcheck=0 \ No newline at end of file