[DDS-1576]: Ansible builder 3 (#195)

dpc-sdp · Aug 7, 2023 · fbb0888 · fbb0888
1 parent 659876b
commit fbb0888
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 1,196 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -120,14 +120,10 @@ jobs:
               IMAGE_TAG=$(.circleci/scripts/tag.sh) docker buildx bake -f bake.hcl --push --no-cache
               echo "==> Push the AWX Executor Environment image"
               pip install --upgrade ansible-builder
-              ansible-builder build \
-                --context=images/awx-ee/context \
-                --tag ghcr.io/dpc-sdp/bay/awx-ee:$(.circleci/scripts/tag.sh) \
-                --tag singledigital/awx-ee:$(.circleci/scripts/tag.sh) \
-                --container-runtime docker \
-                -f images/awx-ee/execution-environment.yml
-              docker push singledigital/awx-ee:$(.circleci/scripts/tag.sh)
-              docker push ghcr.io/dpc-sdp/bay/awx-ee:$(.circleci/scripts/tag.sh)
+              cd images/awx-ee
+              ansible-builder create -f execution-environment.yml
+              docker buildx create --name sdp-amd-arm --platform linux/amd64,linux/arm64 --use
+              docker buildx bake --progress=plain --push --provenance false
             fi
 
 workflows:

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*/awx-ee/context
diff --git a/images/awx-ee/.gitignore b/images/awx-ee/.gitignore
diff --git a/images/awx-ee/bindep.txt b/images/awx-ee/bindep.txt
@@ -1,4 +1,4 @@
-php ==7.4
+php
 php-cli
 php-json
 php-pdo

diff --git a/images/awx-ee/context/Dockerfile b/images/awx-ee/context/Dockerfile
diff --git a/images/awx-ee/context/_build/bindep.txt b/images/awx-ee/context/_build/bindep.txt
diff --git a/images/awx-ee/context/_build/bindep_combined.txt b/images/awx-ee/context/_build/bindep_combined.txt
diff --git a/images/awx-ee/context/_build/requirements.txt b/images/awx-ee/context/_build/requirements.txt
diff --git a/images/awx-ee/context/_build/requirements.yml b/images/awx-ee/context/_build/requirements.yml
diff --git a/images/awx-ee/context/_build/requirements_combined.txt b/images/awx-ee/context/_build/requirements_combined.txt
diff --git a/images/awx-ee/context/_build/scripts/assemble b/images/awx-ee/context/_build/scripts/assemble