diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f55cc04..ce7fa25 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -23,15 +23,19 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox + pip install -r requirements.txt - - name: Build image - env: - DOCKER_BUILDKIT: 1 + - name: Quay login run: | - tox -e docker -- --tag=quay.io/ansible/awx-ee:latest + echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - - name: Push images + - name: Build and push image run: | - echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin - docker push quay.io/ansible/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 ac1431c..e99de5b 100644 --- a/execution-environment.yml +++ b/execution-environment.yml @@ -4,6 +4,9 @@ images: base_image: name: quay.io/centos/centos:stream9 dependencies: + python_interpreter: + package_system: python3.11 + python_path: /usr/bin/python3.11 ansible_core: # Require minimum of 2.15 to get ansible-inventory --limit option package_pip: ansible-core>=2.15.0rc2,<2.16 @@ -14,6 +17,7 @@ dependencies: collections: - name: awx.awx - name: azure.azcollection + version: ">=2.1.0" - name: amazon.aws - name: theforeman.foreman - name: google.cloud @@ -24,9 +28,10 @@ dependencies: - name: ansible.posix - name: ansible.windows - name: redhatinsights.insights + - name: kubevirt.core system: | git-core [platform:rpm] - python3.9-devel [platform:rpm compile] + python3.11-devel [platform:rpm compile] libcurl-devel [platform:rpm compile] krb5-devel [platform:rpm compile] krb5-workstation [platform:rpm] @@ -36,8 +41,13 @@ dependencies: sshpass [platform:rpm] rsync [platform:rpm] epel-release [platform:rpm] - 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 @@ -51,6 +61,7 @@ dependencies: python-daemon pyyaml six + receptorctl additional_build_steps: append_base: - RUN $PYCMD -m pip install -U pip @@ -58,3 +69,5 @@ additional_build_steps: - COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor - RUN mkdir -p /var/run/receptor - RUN git lfs install --system + # SymLink `python` -> `python3.11` + - RUN alternatives --install /usr/bin/python python /usr/bin/python3.11 311