diff --git a/aws/bindep.txt b/aws/bindep.txt index 49c0710..e525b07 100644 --- a/aws/bindep.txt +++ b/aws/bindep.txt @@ -14,5 +14,4 @@ # System dependencies for AWS cldr-runner -unzip -curl \ No newline at end of file +unzip \ No newline at end of file diff --git a/azure/requirements.yml b/azure/requirements.yml index 8cdcb06..7810ac7 100644 --- a/azure/requirements.yml +++ b/azure/requirements.yml @@ -18,6 +18,6 @@ collections: - name: azure.azcollection - version: 1.11.0 + version: 1.14.0 - name: netapp.azure version: 21.10.0 diff --git a/base/execution-environment.yml b/base/execution-environment.yml index 2faffea..acdc216 100644 --- a/base/execution-environment.yml +++ b/base/execution-environment.yml @@ -18,20 +18,31 @@ version: 3 +images: + base_image: + name: quay.io/centos/centos:stream9 + dependencies: ansible_core: package_pip: ansible-core~=2.12.10 + ansible_runner: + package_pip: ansible-runner~=2.1.4 galaxy: requirements.yml python: requirements.txt system: bindep.txt + python_interpreter: + package_system: "python39" additional_build_files: - src: bashrc dest: assets additional_build_steps: + prepend_base: + - RUN yum install -y git + - RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src prepend_builder: - - RUN yum install -y yum-utils && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo + - RUN yum install -y yum-utils && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo prepend_final: - ARG BUILD_VER="latest" - ARG BUILD_DATE="unknown" @@ -56,6 +67,5 @@ additional_build_steps: - RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src append_final: - ADD _build/assets/bashrc /runner/.bashrc - - RUN alternatives --set python /usr/bin/python3 - RUN /usr/bin/python3 -m pip cache purge || echo "No Pip cache to purge" - RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src diff --git a/full/bindep.txt b/full/bindep.txt index 8ce121c..e9e711d 100644 --- a/full/bindep.txt +++ b/full/bindep.txt @@ -21,7 +21,6 @@ tree # AWS unzip -curl # GCP google-cloud-cli \ No newline at end of file diff --git a/full/requirements.yml b/full/requirements.yml index cdc7dc7..d1c1729 100644 --- a/full/requirements.yml +++ b/full/requirements.yml @@ -22,7 +22,7 @@ collections: - name: community.aws version: 3.0.1 - name: azure.azcollection - version: 1.11.0 + version: 1.14.0 - name: netapp.azure version: 21.10.0 - name: google.cloud