Skip to content

Use the IMAGE_REGISTRY env var #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phire-tc wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Use the IMAGE_REGISTRY env var #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
pip install tox

- name: Build EE with Podman
env:
IMAGE_REGISTRY: ${{ vars.IMAGE_REGISTRY }}
run: |
tox -e podman

Expand All @@ -47,5 +49,6 @@ jobs:
- name: Build EE with Docker
env:
DOCKER_BUILDKIT: 1
IMAGE_REGISTRY: ${{ vars.IMAGE_REGISTRY }}
run: |
tox -e docker
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ jobs:
- name: Build image
env:
DOCKER_BUILDKIT: 1
IMAGE_REGISTRY: ${{ vars.IMAGE_REGISTRY }}
run: |
tox -e docker -- --tag=quay.io/ansible/awx-ee:${{ github.event.release.tag_name }}
tox -e docker -- --tag=${{ vars.IMAGE_REGISTRY }}/awx-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 ${{ vars.IMAGE_REGISTRY }}/awx-ee:${{ github.event.release.tag_name }} ${{ vars.IMAGE_REGISTRY }}/awx-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
docker push ${{ vars.IMAGE_REGISTRY }}/awx-ee:${{ github.event.release.tag_name }}
docker push ${{ vars.IMAGE_REGISTRY }}/awx-ee:latest
8 changes: 4 additions & 4 deletions tox.ini
View file
Open in desktop
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 {env:IMAGE_REGISTRY}/awx-ee:latest || true"
ansible-builder build -v3 -t {env:IMAGE_REGISTRY}/awx-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 {env:IMAGE_REGISTRY}/awx-ee:latest || true"
ansible-builder build -v3 -t {env:IMAGE_REGISTRY}/awx-ee {posargs} --container-runtime=docker