Merge pull request #21 from shanemcd/cleanup-cleanup

Regenerate build context with ansible-builder 0.5.1 Reviewed-by: https://github.com/apps/ansible-zuul
ansible · Dec 22, 2020 · a4dbae5 · a4dbae5
2 parents 3c94d6c + f677bf1
commit a4dbae5
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 37 deletions.
diff --git a/Containerfile b/Containerfile
@@ -1,16 +1,16 @@
 FROM quay.io/ansible/ansible-runner:devel as galaxy
 
-ADD requirements.yml /build/
+ADD _build/requirements.yml /build/_build/requirements.yml
 
-RUN ansible-galaxy role install -r /build/requirements.yml --roles-path /usr/share/ansible/roles
-RUN ansible-galaxy collection install -r /build/requirements.yml --collections-path /usr/share/ansible/collections
+RUN ansible-galaxy role install -r /build/_build/requirements.yml --roles-path /usr/share/ansible/roles
+RUN ansible-galaxy collection install -r /build/_build/requirements.yml --collections-path /usr/share/ansible/collections
 
 RUN mkdir -p /usr/share/ansible/roles /usr/share/ansible/collections
 
 FROM quay.io/ansible/python-builder:latest as builder
 
-ADD requirements_combined.txt /tmp/src/requirements.txt
-ADD bindep_combined.txt /tmp/src/bindep.txt
+ADD _build/requirements_combined.txt /tmp/src/requirements.txt
+ADD _build/bindep_combined.txt /tmp/src/bindep.txt
 RUN assemble
 
 FROM quay.io/ansible/ansible-runner:devel

diff --git a/tools/bindep.txt → _build/bindep.txt b/tools/bindep.txt → _build/bindep.txt
diff --git a/bindep_combined.txt → _build/bindep_combined.txt b/bindep_combined.txt → _build/bindep_combined.txt
diff --git a/introspect.py → _build/introspect.py b/introspect.py → _build/introspect.py
diff --git a/requirements.yml → _build/requirements.yml b/requirements.yml → _build/requirements.yml
diff --git a/requirements_combined.txt → _build/requirements_combined.txt b/requirements_combined.txt → _build/requirements_combined.txt
diff --git a/bindep_output.txt b/bindep_output.txt
diff --git a/tools/execution-environment.yaml → execution-environment.yml b/tools/execution-environment.yaml → execution-environment.yml
@@ -1,8 +1,8 @@
 ---
 version: 1
 dependencies:
-  galaxy: requirements.yaml
-  system: bindep.txt
+  galaxy: _build/requirements.yml
+  system: _build/bindep.txt
 additional_build_steps:
   append:
     - RUN alternatives --set python /usr/bin/python3
diff --git a/tools/requirements.yaml b/tools/requirements.yaml
diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,7 @@ whitelist_external =
   true
 commands =
   /bin/bash -c "podman rmi quay.io/ansible/awx-ee:latest || true"
-  ansible-builder build -v3 -c . -f tools/execution-environment.yaml -t quay.io/ansible/awx-ee
+  ansible-builder build -v3 -c . -t quay.io/ansible/awx-ee
 
 [testenv:ansible-builder]
 passenv =