From 0645db227b2eb2c115a746df7166e789d5ca502d Mon Sep 17 00:00:00 2001
From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:38:04 -0500
Subject: [PATCH] Build and push amd64 and arm64 image

---
 .github/workflows/build-latest.yml | 19 ++++++++++---------
 execution-environment.yml          |  5 +++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
index 83f049a..ce7fa25 100644
--- a/.github/workflows/build-latest.yml
+++ b/.github/workflows/build-latest.yml
@@ -23,18 +23,19 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox
+          pip install -r requirements.txt
 
       - name: Quay login
         run: |
           echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin
 
-      - name: Build image
-        env:
-          DOCKER_BUILDKIT: 1
+      - name: Build and push image
         run: |
-          tox -e docker -- --tag=${{ vars.IMAGE_REGISTRY }}/awx-ee:latest
-
-      - name: Push images
-        run: |
-         docker push ${{ vars.IMAGE_REGISTRY }}/awx-ee:latest
+          docker buildx create --name awx-ee-buildx
+          docker buildx use awx-ee-buildx
+          ansible-builder create -v3 --output-file=Dockerfile
+          docker buildx build \
+            --push \
+            --platform=linux/amd64,linux/arm64 \
+            --tag=${{ vars.IMAGE_REGISTRY }}/awx-ee:latest \
+            context
diff --git a/execution-environment.yml b/execution-environment.yml
index 823b2ee..97dc953 100644
--- a/execution-environment.yml
+++ b/execution-environment.yml
@@ -39,6 +39,11 @@ dependencies:
     python-unversioned-command [platform:rpm]
     unzip [platform:rpm]
     podman-remote [platform:rpm]
+    cmake [platform:rpm compile]
+    gcc [platform:rpm compile]
+    gcc-c++ [platform:rpm compile]
+    make [platform:rpm compile]
+    openssl-devel [platform:rpm compile]
   python: |
     git+https://github.com/ansible/ansible-sign
     ncclient