From 053768a3835fb57ea63c4a5f2819213193a24bbb Mon Sep 17 00:00:00 2001
From: Salvatore Daniele <sdaniele@redhat.com>
Date: Thu, 28 Sep 2023 17:26:40 -0400
Subject: [PATCH] test simple multi-arch build

Signed-off-by: Salvatore Daniele <sdaniele@redhat.com>
---
 .github/workflows/build-and-push.yml | 12 ++++++------
 images/Containerfile                 |  7 +------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index c59078b2..7b176cbc 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -29,7 +29,7 @@ jobs:
         file: ./images/Containerfile
         push: true
         tags: |
-          quay.io/wizhao/tft-tools:${{ steps.date.outputs.date }}-x86_64
+          quay.io/sdaniele/tft-tools:${{ steps.date.outputs.date }}-x86_64
     - name: Build and Push TFT-ARM64 image
       uses: docker/build-push-action@v2
       with:
@@ -37,11 +37,11 @@ jobs:
         push: true
         platforms: linux/arm64
         tags: |
-          quay.io/wizhao/tft-tools:${{ steps.date.outputs.date }}-aarch64
+          quay.io/sdaniele/tft-tools:${{ steps.date.outputs.date }}-aarch64
     - name: Create and Push Multi-Architecture Manifest
       run: |
         sudo podman manifest create tft-tools-${{ steps.date.outputs.date }}-list
-        sudo podman manifest add tft-tools-${{ steps.date.outputs.date }}-list quay.io/wizhao/tft-tools:${{ steps.date.outputs.date }}-x86_64
-        sudo podman manifest add tft-tools-${{ steps.date.outputs.date }}-list quay.io/wizhao/tft-tools:${{ steps.date.outputs.date }}-aarch64
-        sudo podman manifest push tft-tools-${{ steps.date.outputs.date }}-list quay.io/wizhao/tft-tools:${{ steps.date.outputs.date }}
-        sudo podman manifest push tft-tools-${{ steps.date.outputs.date }}-list quay.io/wizhao/tft-tools:latest
\ No newline at end of file
+        sudo podman manifest add tft-tools-${{ steps.date.outputs.date }}-list quay.io/sdaniele/tft-tools:${{ steps.date.outputs.date }}-x86_64
+        sudo podman manifest add tft-tools-${{ steps.date.outputs.date }}-list quay.io/sdaniele/tft-tools:${{ steps.date.outputs.date }}-aarch64
+        sudo podman manifest push tft-tools-${{ steps.date.outputs.date }}-list quay.io/sdaniele/tft-tools:${{ steps.date.outputs.date }}
+        sudo podman manifest push tft-tools-${{ steps.date.outputs.date }}-list quay.io/sdaniele/tft-tools:latest
\ No newline at end of file
diff --git a/images/Containerfile b/images/Containerfile
index fc5b46bc..7a1f057a 100644
--- a/images/Containerfile
+++ b/images/Containerfile
@@ -1,10 +1,5 @@
 FROM quay.io/centos/centos:stream9
 
-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}
+RUN INSTALL_PKGS="vim wget" && yum install -y ${INSTALL_PKGS}
 
 CMD ["/bin/bash"]