From 33123ee7f5a4768a871d8a1025070c0dbf5b6f8c Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Sun, 22 Oct 2023 05:03:41 +0100 Subject: [PATCH] ci: replace all refs to repo with gh vars --- .github/workflows/build_ci_img.yml | 3 +-- .github/workflows/build_odk_imgs.yml | 8 ++++---- .github/workflows/docs.yml | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_ci_img.yml b/.github/workflows/build_ci_img.yml index 0b4d2fde0d..385ccce5e2 100644 --- a/.github/workflows/build_ci_img.yml +++ b/.github/workflows/build_ci_img.yml @@ -20,9 +20,8 @@ jobs: with: context: src/backend build_target: ci - image_name: ghcr.io/${{ github.repository }}/backend image_tags: | - "ghcr.io/hotosm/fmtm/backend:ci-${{ github.ref_name }}" + "ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }}" build_args: | APP_VERSION=${{ github.ref_name }} COMMIT_REF=${{ github.sha }} diff --git a/.github/workflows/build_odk_imgs.yml b/.github/workflows/build_odk_imgs.yml index 75a9b08660..09ca4f6562 100644 --- a/.github/workflows/build_odk_imgs.yml +++ b/.github/workflows/build_odk_imgs.yml @@ -17,8 +17,8 @@ jobs: with: context: odkcentral/api image_tags: | - "ghcr.io/hotosm/fmtm/odkcentral:${{ vars.ODK_CENTRAL_TAG }}" - "ghcr.io/hotosm/fmtm/odkcentral:latest" + "ghcr.io/${{ github.repository }}/odkcentral:${{ vars.ODK_CENTRAL_TAG }}" + "ghcr.io/${{ github.repository }}/odkcentral:latest" build_args: | ODK_CENTRAL_TAG=${{ vars.ODK_CENTRAL_TAG }} @@ -27,5 +27,5 @@ jobs: with: context: odkcentral/proxy image_tags: | - "ghcr.io/hotosm/fmtm/odkcentral-proxy:${{ vars.ODK_CENTRAL_TAG }}" - "ghcr.io/hotosm/fmtm/odkcentral-proxy:latest" + "ghcr.io/${{ github.repository }}/odkcentral-proxy:${{ vars.ODK_CENTRAL_TAG }}" + "ghcr.io/${{ github.repository }}/odkcentral-proxy:latest" diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 872fc8a607..34ec15e157 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,7 +19,7 @@ jobs: build_openapi_json: uses: hotosm/gh-workflows/.github/workflows/openapi_build.yml@main with: - image: ghcr.io/hotosm/fmtm/backend:ci-${{ github.ref_name }} + image: ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }} example_env_file_path: ".env.example" output_path: docs/openapi.json @@ -29,6 +29,6 @@ jobs: - build_doxygen - build_openapi_json with: - image: ghcr.io/hotosm/fmtm/backend:ci-${{ github.ref_name }} + image: ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }} doxygen: true openapi: true