From f012a69c9348ac12247180d492f90c0ba58c877a Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 2 May 2023 11:47:29 -0400 Subject: [PATCH] Allow running AWX checks on forks (#13938) --- .github/workflows/ci.yml | 2 +- Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74d3f955f0..8de308051b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI env: LC_ALL: "C.UTF-8" # prevent ERROR: Ansible could not initialize the preferred locale: unsupported locale setting CI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEV_DOCKER_TAG_BASE: ghcr.io/${{ github.repository_owner }} + DEV_DOCKER_OWNER: ${{ github.repository_owner }} COMPOSE_TAG: ${{ github.base_ref || 'devel' }} on: pull_request: diff --git a/Makefile b/Makefile index e654a1e445..12a6328000 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,10 @@ TACACS ?= false VENV_BASE ?= /var/lib/awx/venv -DEV_DOCKER_TAG_BASE ?= ghcr.io/ansible +DEV_DOCKER_OWNER ?= ansible +# Docker will only accept lowercase, so github names like Paul need to be paul +DEV_DOCKER_OWNER_LOWER = $(shell echo $(DEV_DOCKER_OWNER) | tr A-Z a-z) +DEV_DOCKER_TAG_BASE ?= ghcr.io/$(DEV_DOCKER_OWNER_LOWER) DEVEL_IMAGE_NAME ?= $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) RECEPTOR_IMAGE ?= quay.io/ansible/receptor:devel