From de4edbbf3b47496cf8f4757e7a1f8280862a36de Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Sun, 6 Apr 2025 21:08:23 -0500 Subject: [PATCH] chore: use default imag repo name (#212) Signed-off-by: Jack Yu --- .../build-and-publish-catalog-on-release.yaml | 1 - .github/workflows/build-extension-catalog.yml | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-and-publish-catalog-on-release.yaml b/.github/workflows/build-and-publish-catalog-on-release.yaml index 3e41a295..a622f188 100644 --- a/.github/workflows/build-and-publish-catalog-on-release.yaml +++ b/.github/workflows/build-and-publish-catalog-on-release.yaml @@ -32,5 +32,4 @@ jobs: with: registry_target: docker.io registry_user: rancher - repository_name: harvester-ui-catalog secrets: inherit diff --git a/.github/workflows/build-extension-catalog.yml b/.github/workflows/build-extension-catalog.yml index c81f8a27..3e2f2cfc 100644 --- a/.github/workflows/build-extension-catalog.yml +++ b/.github/workflows/build-extension-catalog.yml @@ -6,9 +6,6 @@ on: registry_target: required: true type: string - repository_name: - required: true - type: string registry_user: required: true type: string @@ -69,13 +66,5 @@ jobs: - name: Build and push UI image run: | - publish="yarn publish-pkgs -c -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}" - $publish - - REPO_NAME=$(echo "${{ github.repository }}" | cut -d'/' -f2) - IMAGE_VERSION=$(cat package.json | jq .version | sed 's/"//g') - FULL_IMAGE_NAME=$(echo ${{ inputs.registry_target }}/${{ inputs.registry_user }}/ui-extension-$REPO_NAME:$IMAGE_VERSION) - IMAGE_ID=$(docker inspect --format='{{.Id}}' $FULL_IMAGE_NAME) - - docker tag $IMAGE_ID ${{ inputs.registry_target }}/${{ inputs.registry_user }}/${{ inputs.repository_name }}:$IMAGE_VERSION - docker push ${{ inputs.registry_target }}/${{ inputs.registry_user }}/${{ inputs.repository_name }}:$IMAGE_VERSION \ No newline at end of file + publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}" + $publish \ No newline at end of file