这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/issue_labeler.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/build-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
# build and push anytime commits are merged to devel
branches:
- devel
- main
schedule:
# build every 12 hours
- cron: '0 */12 * * *'
Expand All @@ -29,9 +29,9 @@ jobs:
env:
DOCKER_BUILDKIT: 1
run: |
tox -e docker -- --tag=quay.io/ansible/awx-ee:latest
tox -e docker -- --tag=ghcr.io/${{ github.repository_owner }}/ascender-ee:latest

- name: Push images
run: |
echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin
docker push quay.io/ansible/awx-ee:latest
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:latest
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: CI

on:
pull_request:
branches: [devel]
branches: [main]

push:
branches: [devel]
branches: [main]

jobs:
podman:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
env:
DOCKER_BUILDKIT: 1
run: |
tox -e docker -- --tag=quay.io/ansible/awx-ee:${{ github.event.release.tag_name }}
tox -e docker -- --tag=ghcr.io/ctrliq/ascender-ee:${{ github.event.release.tag_name }}

- name: Apply latest tag
run: |
docker tag quay.io/ansible/awx-ee:${{ github.event.release.tag_name }} quay.io/ansible/awx-ee:latest
docker tag ghcr.io/${{ github.repository_owner }}/ascender-ee:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/ascender-ee:latest

- name: Push images
run: |
echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin
docker push quay.io/ansible/awx-ee:${{ github.event.release.tag_name }}
docker push quay.io/ansible/awx-ee:latest
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:${{ github.event.release.tag_name }}
docker push ghcr.io/${{ github.repository_owner }}/ascender-ee:latest
21 changes: 0 additions & 21 deletions .github/workflows/triage_new.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ First, [install ansible-builder](https://ansible-builder.readthedocs.io/en/stabl
Then run the following command from the root of this repo:

```bash
$ ansible-builder build -v3 -t quay.io/ansible/awx-ee # --container-runtime=docker # Is podman by default
$ ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee # --container-runtime=docker # Is podman by default
```
5 changes: 3 additions & 2 deletions execution-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 3
images:
base_image:
name: quay.io/centos/centos:stream9
name: rockylinux:9
dependencies:
ansible_core:
# Require minimum of 2.15 to get ansible-inventory --limit option
Expand All @@ -23,9 +23,10 @@ dependencies:
- name: kubernetes.core
- name: ansible.posix
- name: ansible.windows
- name: redhatinsights.insights
system: |
git-core [platform:rpm]
gcc [platform:rpm]
gcc-c++ [platform:rpm]
python3.9-devel [platform:rpm compile]
libcurl-devel [platform:rpm compile]
krb5-devel [platform:rpm compile]
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ allowlist_externals =
/bin/bash
podman
commands =
/bin/bash -c "podman rmi quay.io/ansible/awx-ee:latest || true"
ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs}
/bin/bash -c "podman rmi ghcr.io/ctrliq/ascender-ee:latest || true"
ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee {posargs}

[testenv:docker]
passenv = HOME,DOCKER_BUILDKIT
allowlist_externals =
/bin/bash
docker
commands =
/bin/bash -c "docker rmi quay.io/ansible/awx-ee:latest || true"
ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} --container-runtime=docker
/bin/bash -c "docker rmi ghcr.io/ctrliq/ascender-ee:latest || true"
ansible-builder build -v3 -t ghcr.io/ctrliq/ascender-ee {posargs} --container-runtime=docker