Skip to content

Commit

Permalink
Merge pull request wizhaoredhat#11 from vrindle/enable_crictl_final
Browse files Browse the repository at this point in the history
Fixed containerfile to add working crictl. Updated TFT tools image to…
  • Loading branch information
wizhaoredhat authored Sep 27, 2023
2 parents 6daf151 + 9753f26 commit efbea39
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from typing import List

FT_BASE_IMG = "quay.io/wizhao/ft-base-image:0.9"
TFT_TOOLS_IMG = "quay.io/wizhao/tft-tools:0.3"
TFT_TOOLS_IMG = "quay.io/wizhao/tft-tools:09-27-2023"
TFT_TESTS = "tft-tests"

class TestType(Enum):
Expand Down
6 changes: 4 additions & 2 deletions images/Containerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM quay.io/centos/centos:stream9

RUN curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/CentOS_8/devel:kubic:libcontainers:stable.repo \
curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable:cri-o:${VERSION}.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:${VERSION}/CentOS_8/devel:kubic:libcontainers:stable:cri-o:${VERSION}.repo
RUN curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable:cri-o:1.26.1.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:1.26.1/CentOS_9_Stream/devel:kubic:libcontainers:stable:cri-o:1.26.1.repo

RUN curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_9_Stream/devel:kubic:libcontainers:stable.repo


RUN INSTALL_PKGS="vim wget jq python3 git cri-tools net-tools iptables iproute pciutils ethtool httpd iperf3 tcpdump sysstat ipmitool util-linux" && yum install -y ${INSTALL_PKGS}

Expand Down

0 comments on commit efbea39

Please sign in to comment.