Skip to content

Commit d0cf820

Browse files
Copilotcastrojo
andcommitted
fix: configure rechunk action to run on built image
- Updated rechunk action version from v1.1.1 to v1.2.4 - Fixed rechunk 'ref' parameter to use the correct image reference - Removed invalid CENTOS_VERSION variable reference - Updated rechunk tool version from v1.0.1 to v1.2.4 - Replaced inline labels with proper multi-line labels format - Changed buildah tags to only use DEFAULT_TAG for initial build - Removed obsolete skip_compression parameter - Rechunk now properly processes the locally built image Co-authored-by: castrojo <1264109+castrojo@users.noreply.github.com>
1 parent e8988a4 commit d0cf820

1 file changed

Lines changed: 21 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,24 +114,37 @@ jobs:
114114
# Postfix image name with -custom to make it a little more descriptive
115115
# Syntax: https://docs.github.com/en/actions/learn-github-actions/expressions#format
116116
image: ${{ env.IMAGE_NAME }}
117-
tags: ${{ steps.metadata.outputs.tags }}
117+
tags: ${{ env.DEFAULT_TAG }}
118118
labels: ${{ steps.metadata.outputs.labels }}
119119
oci: false
120120

121121
# Rechunk is a script that we use on Universal Blue to make sure there isnt a single huge layer when your image gets published.
122122
# This does not make your image faster to download, just provides better resumability and fixes a few errors.
123123
# Documentation for Rechunk is provided on their github repository at https://github.com/hhd-dev/rechunk
124-
# You can enable it by uncommenting the following lines:
125124
- name: Run Rechunker
126125
id: rechunk
127-
uses: hhd-dev/rechunk@f153348d8100c1f504dec435460a0d7baf11a9d2 # v1.1.1
126+
uses: hhd-dev/rechunk@5fbe1d3a639615d2548d83bc888360de6267b1a2 # v1.2.4
128127
with:
129-
rechunk: 'ghcr.io/hhd-dev/rechunk:v1.0.1'
130-
ref: "localhost/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}"
128+
rechunk: 'ghcr.io/hhd-dev/rechunk:v1.2.4'
129+
ref: "${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}"
131130
prev-ref: "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}"
132-
skip_compression: true
133-
version: ${{ env.CENTOS_VERSION }}
134-
labels: ${{ steps.metadata.outputs.labels }} # Rechunk strips out all the labels during build, this needs to be reapplied here with newline separator
131+
version: "${{ env.DEFAULT_TAG }}"
132+
labels: |
133+
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/${{ github.sha }}/README.md
134+
org.opencontainers.image.created=${{ steps.date.outputs.date }}
135+
org.opencontainers.image.description=${{ env.IMAGE_DESC }}
136+
org.opencontainers.image.documentation=https://raw.githubusercontent.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/${{ github.sha }}/README.md
137+
org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/blob/${{ github.sha }}/Containerfile
138+
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
139+
org.opencontainers.image.url=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/tree/${{ github.sha }}
140+
org.opencontainers.image.vendor=${{ github.repository_owner }}
141+
org.opencontainers.image.version=${{ env.DEFAULT_TAG }}.{{date 'YYYYMMDD'}}
142+
io.artifacthub.package.deprecated=false
143+
io.artifacthub.package.keywords=${{ env.IMAGE_KEYWORDS }}
144+
io.artifacthub.package.license=Apache-2.0
145+
io.artifacthub.package.logo-url=${{ env.IMAGE_LOGO_URL }}
146+
io.artifacthub.package.prerelease=false
147+
containers.bootc=1
135148
136149
# This is necessary so that the podman socket can find the rechunked image on its storage
137150
- name: Load in podman and tag

0 commit comments

Comments
 (0)