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.

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

Determine CPU architecture with $basearch #350

Merged
merged 1 commit into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion snafu/benchmarks/uperf/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi8:latest

RUN dnf install -y --nodocs git python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran && dnf clean all
COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
RUN dnf install -y --nodocs hostname procps-ng iproute net-tools ethtool nmap iputils https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf clean all
RUN dnf install -y uperf && dnf clean all
Expand Down
2 changes: 1 addition & 1 deletion snafu/fio_wrapper/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.access.redhat.com/ubi8:latest as builder
COPY snafu/image_resources/ppc64le/centos8.repo /etc/yum.repos.d/centos8.repo
COPY snafu/image_resources/centos8.repo /etc/yum.repos.d/centos8.repo
RUN dnf install -y --enablerepo=centos8 make gcc libaio zlib-devel libaio-devel
RUN curl -L https://github.com/axboe/fio/archive/fio-3.27.tar.gz | tar xzf -
RUN pushd fio-fio-3.27 && ./configure --disable-native && make -j2
Expand Down
14 changes: 1 addition & 13 deletions snafu/image_resources/centos8-appstream.repo
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
[centos8-appstream]
name=CentOS-8-Appstream
baseurl=http://mirror.centos.org/centos/8/AppStream/x86_64/os/
enabled=0
gpgcheck=0

[centos8-appstream-aarch64]
name=CentOS-8-Appstream-aarch64
baseurl=http://mirror.centos.org/centos/8/AppStream/aarch64/os/
enabled=0
gpgcheck=0

[centos8-appstream-ppc64le]
name=CentOS-8-Appstream-ppc64le
baseurl=http://mirror.centos.org/centos/8/AppStream/ppc64le//os/
baseurl=http://mirror.centos.org/centos/8/AppStream/$basearch/os/
enabled=0
gpgcheck=0
2 changes: 1 addition & 1 deletion snafu/image_resources/centos8.repo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[centos8]
name=CentOS-8
baseurl=http://mirror.centos.org/centos/8/BaseOS/x86_64/os/
baseurl=http://mirror.centos.org/centos/8/BaseOS/$basearch/os/
enabled=0
gpgcheck=0
5 changes: 0 additions & 5 deletions snafu/image_resources/ppc64le/centos8-appstream.repo

This file was deleted.

5 changes: 0 additions & 5 deletions snafu/image_resources/ppc64le/centos8.repo

This file was deleted.

2 changes: 1 addition & 1 deletion snafu/iperf/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.access.redhat.com/ubi8:latest

COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
RUN dnf install -y --nodocs iperf3 --enablerepo=centos8-appstream
RUN dnf install -y --nodocs procps-ng iproute net-tools ethtool nmap iputils
2 changes: 1 addition & 1 deletion snafu/scale_openshift_wrapper/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8:latest

COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
RUN dnf install -y --nodocs python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran && dnf clean all
RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz -C /usr/bin/ oc
Expand Down
2 changes: 1 addition & 1 deletion snafu/upgrade_openshift_wrapper/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8:latest

COPY snafu/image_resources/ppc64le/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
COPY snafu/image_resources/centos8-appstream.repo /etc/yum.repos.d/centos8-appstream.repo
RUN dnf install -y --nodocs python3 python3-pip gcc python3-devel gcc-c++ atlas-devel gcc-gfortran && dnf clean all
RUN dnf install -y --nodocs redis --enablerepo=centos8-appstream && dnf clean all
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/openshift-client-linux.tar.gz | tar xz -C /usr/bin/ oc
Expand Down