From f988306f9c08e78e07bea40c3d6b56b6a2f65407 Mon Sep 17 00:00:00 2001 From: max-allan Date: Mon, 13 Nov 2023 19:34:10 +0000 Subject: [PATCH 1/2] Remove unused flags on publish Fixes #125 Signed-off-by: max-allan --- apko-snapshot/action.yaml | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/apko-snapshot/action.yaml b/apko-snapshot/action.yaml index 882b066..0e15e27 100644 --- a/apko-snapshot/action.yaml +++ b/apko-snapshot/action.yaml @@ -89,29 +89,6 @@ inputs: required: false default: '' - package-version-tag: - description: | - apko can tag the final image with the version of the corresponding apk package passed in here. - required: false - default: '' - - package-version-tag-stem: - description: | - stem version tags. - required: false - - package-version-tag-prefix: - description: | - prefix for version tag(s). - required: false - default: '' - - tag-suffix: - description: | - Suffix to use with the package-version-tag feature, if any. - required: false - default: '' - sbom-attest: description: | Upload SBOMs as attestations. @@ -148,11 +125,6 @@ inputs: The value to pass to --image-refs. default: apko.images - stage_tags: - description: | - The value to pass to --stage-tags. - default: '' - automount-src: description: | In subsequent steps, if this directory is found, create a copy at automount-dest (inside container) @@ -246,7 +218,6 @@ runs: config: ${{ inputs.config }} tag: ${{ inputs.base-tag }}:${{ inputs.target-tag }}-${{ steps.snapshot-date.outputs.date }} image_refs: ${{ inputs.image_refs }} - stage_tags: ${{ inputs.stage_tags }} use-docker-mediatypes: ${{ inputs.use-docker-mediatypes }} keyring-append: ${{ inputs.keyring-append }} repository-append: ${{ inputs.repository-append }} @@ -255,10 +226,6 @@ runs: debug: ${{ inputs.debug }} automount-src: ${{ inputs.automount-src }} automount-dest: ${{ inputs.automount-dest }} - package-version-tag: ${{ inputs.package-version-tag }} - package-version-tag-stem: ${{ inputs.package-version-tag-stem }} - package-version-tag-prefix: ${{ inputs.package-version-tag-prefix }} - tag-suffix: ${{ inputs.tag-suffix }} build-options: ${{ inputs.build-options }} sbom-path: ${{ steps.apko-publish-inputs.outputs.sbom-path }} generic-user: ${{ inputs.generic-user }} From deb3a9ada5e090a7a7038a699802778bfff8a464 Mon Sep 17 00:00:00 2001 From: max-allan Date: Mon, 13 Nov 2023 19:54:56 +0000 Subject: [PATCH 2/2] Update action.yaml Signed-off-by: max-allan --- apko-publish/action.yaml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/apko-publish/action.yaml b/apko-publish/action.yaml index c44b194..9ea3cb8 100644 --- a/apko-publish/action.yaml +++ b/apko-publish/action.yaml @@ -41,11 +41,6 @@ inputs: The value to pass to --image-refs. default: /tmp/apko.images - stage_tags: - description: | - The value to pass to --stage-tags. - default: '' - keyring-append: description: | The value to pass to --keyring-append. @@ -107,31 +102,6 @@ inputs: If automount-src is found, create a copy at this location (inside container) default: /work - package-version-tag: - description: | - apko can tag the final image with the version of the corresponding apk package passed in here. - required: false - default: '' - - package-version-tag-stem: - description: | - stem version tags. - type: boolean - required: false - default: false - - package-version-tag-prefix: - description: | - prefix for version tag(s). - required: false - default: '' - - tag-suffix: - description: | - Suffix to use with the package-version-tag feature, if any. - required: false - default: '' - sbom-path: description: | Path to write the SBOMs. @@ -219,7 +189,7 @@ runs: ${{ inputs.use-docker-mediatypes && '--use-docker-mediatypes' }} \ ${{ inputs.package-version-tag-stem && '--package-version-tag-stem' }} \ '--debug' \ - --image-refs="${{ inputs.image_refs }}" --stage-tags="${{ inputs.stage_tags }}" ${{ inputs.config }} ${{ inputs.tag }} $keys $repos $packages $archs $build_options $packageVersionTag $packageVersionTagPrefix $tagSuffix $sbomPath | tee ${DIGEST_FILE} + --image-refs="${{ inputs.image_refs }}" ${{ inputs.config }} ${{ inputs.tag }} $keys $repos $packages $archs $build_options $sbomPath | tee ${DIGEST_FILE} echo EXIT CODE: $? echo ::set-output name=digest::$(cat ${DIGEST_FILE}) EOF