diff --git a/.github/workflows/docker-publish-template.yml b/.github/workflows/docker-publish-template.yml index 7a2cc0e..e710fce 100644 --- a/.github/workflows/docker-publish-template.yml +++ b/.github/workflows/docker-publish-template.yml @@ -23,7 +23,7 @@ on: description: Package path required: false type: string - default: 'docker/' + default: 'docker' registry: description: Github released tag name required: false @@ -101,7 +101,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ${{ inputs.path }}Dockerfile + file: ${{ inputs.path }}/Dockerfile platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.image-tags.outputs.tags }} diff --git a/.github/workflows/helm-docker-release-please-template.yml b/.github/workflows/helm-docker-release-please-template.yml index 7a7ce86..3b8d224 100644 --- a/.github/workflows/helm-docker-release-please-template.yml +++ b/.github/workflows/helm-docker-release-please-template.yml @@ -57,6 +57,8 @@ jobs: if: inputs.package_type == 'docker' name: "Docker publish (${{ inputs.package }}-${{ inputs.version }})" uses: okdp/gh-workflows/.github/workflows/docker-publish-template.yml@v1 + with: + path: ${{ inputs.path }} secrets: inherit diff --git a/.github/workflows/helm-docker-release-please.yml b/.github/workflows/helm-docker-release-please.yml index 669851f..4ee7aa7 100644 --- a/.github/workflows/helm-docker-release-please.yml +++ b/.github/workflows/helm-docker-release-please.yml @@ -52,14 +52,14 @@ jobs: { path: path, package: path.includes('helm/') ? path.replace(/^.+\//,''): '${{ github.repository }}'.replace(/^.+\//,''), - version: releases_output[`${path}--version`], - package_type: path.replace(/\/.+/,''), - tag_name: releases_output[`${path}--tag_name`] + version: releases_output[`${path}--version`] || releases_output['version'], + package_type: path.replace(/^\.|\/.*/, '') || 'docker', + tag_name: releases_output[`${path}--tag_name`] || releases_output['version'] } ) } return github_releases - + publish: if: needs.release-please.outputs.github_releases != '[]' needs: [release-please] diff --git a/.gitignore b/.gitignore index 94d918d..9b37f84 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ bin/ ### vscode ### .vscode/ +.tmp/ # Other tmp/ \ No newline at end of file