diff --git a/.github/actions/awx_devel_image/action.yml b/.github/actions/awx_devel_image/action.yml index 8b7081292b..0d7ea9ac37 100644 --- a/.github/actions/awx_devel_image/action.yml +++ b/.github/actions/awx_devel_image/action.yml @@ -11,6 +11,12 @@ runs: shell: bash run: echo py_version=`make PYTHON_VERSION` >> $GITHUB_ENV + - name: Set lower case owner name + shell: bash + run: echo "OWNER_LC=${OWNER,,}" >> $GITHUB_ENV + env: + OWNER: '${{ github.repository_owner }}' + - name: Log in to registry shell: bash run: | @@ -18,11 +24,11 @@ runs: - name: Pre-pull latest devel image to warm cache shell: bash - run: docker pull ghcr.io/${{ github.repository_owner }}/awx_devel:${{ github.base_ref }} + run: docker pull ghcr.io/${OWNER_LC}/awx_devel:${{ github.base_ref }} - name: Build image for current source checkout shell: bash run: | - DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} \ + DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \ COMPOSE_TAG=${{ github.base_ref }} \ make docker-compose-build diff --git a/.github/actions/run_awx_devel/action.yml b/.github/actions/run_awx_devel/action.yml index 57dcb54b42..d1f688bcdf 100644 --- a/.github/actions/run_awx_devel/action.yml +++ b/.github/actions/run_awx_devel/action.yml @@ -35,7 +35,7 @@ runs: - name: Start AWX shell: bash run: | - DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} \ + DEV_DOCKER_OWNER=${{ github.repository_owner }} \ COMPOSE_TAG=${{ github.base_ref }} \ COMPOSE_UP_OPTS="-d" \ make docker-compose