Skip to content

Commit 2051651

Browse files
committed
fix: refactor manifest creation
1 parent 23734e5 commit 2051651

File tree

3 files changed

+26
-35
lines changed

3 files changed

+26
-35
lines changed

.github/workflows/buildmusl.yaml

+20-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ name: Build and Push musl
22

33
on:
44
push:
5-
branches:
6-
- main
75
tags:
86
- 'v*'
97

108
env:
119
IMAGE_NAME: core-dump-handler-musl
12-
IMAGE_TAGS: v8.5.0 ${{ github.sha }}
10+
IMAGE_TAGS: ${{ github.sha }}
1311
IMAGE_REGISTRY: quay.io
1412
IMAGE_NAMESPACE: icdh
1513

@@ -26,6 +24,9 @@ jobs:
2624
# Checkout push-to-registry action github repository
2725
- name: Checkout Push to Registry action
2826
uses: actions/checkout@v2
27+
28+
- id: tag
29+
run: echo ::set-output name=TAG::${GITHUB_REF#refs/tags/}
2930

3031
- name: Install qemu dependency
3132
run: |
@@ -36,22 +37,32 @@ jobs:
3637
uses: redhat-actions/buildah-build@main
3738
with:
3839
image: ${{ env.IMAGE_NAME }}
39-
tags: ${{ env.IMAGE_TAGS }}
40+
tags: ${{ steps.tag.outputs.TAG }}-linux-${{ matrix.arch }}
4041
arch: ${{ matrix.arch }}
4142
build-args: ARCH=${{ matrix.arch }}
4243
containerfiles: |
4344
./musl.Dockerfile
44-
# Push the image manifest to Quay.io (Image Registry)
4545
- name: Push To Quay
4646
uses: redhat-actions/push-to-registry@v2
4747
id: push
4848
with:
4949
image: ${{ steps.build_image.outputs.image }}
50-
tags: ${{ steps.build_image.outputs.tags }}
50+
tags: ${{ steps.tag.outputs.TAG }}-linux-${{ matrix.arch }}
5151
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
5252
username: ${{ secrets.REGISTRY_USER }}
5353
password: ${{ secrets.REGISTRY_PASSWORD }}
54-
55-
- name: Echo outputs
54+
- name: Docker Login
55+
uses: docker/login-action@v1
56+
with:
57+
username: ${{ secrets.REGISTRY_USER }}
58+
password: ${{ secrets.REGISTRY_PASSWORD }}
59+
registry: quay.io
60+
- name: Build Manifest
61+
id: manifests
62+
continue-on-error: true
5663
run: |
57-
echo "${{ toJSON(steps.push.outputs) }}"
64+
docker manifest create \
65+
${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{env.IMAGE_NAME}}:${{ steps.tag.outputs.TAG }} \
66+
${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{env.IMAGE_NAME}}:${{ steps.tag.outputs.TAG }}-linux-amd64 \
67+
${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{env.IMAGE_NAME}}:${{ steps.tag.outputs.TAG }}-linux-arm64
68+
- run: docker manifest push ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{env.IMAGE_NAME}}:${{ steps.tag.outputs.TAG }}

charts/core-dump-handler/Chart.yaml

+5-25
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ sources:
1010

1111
type: application
1212

13-
version: v8.5.0
13+
version: v8.5.1
1414

15-
appVersion: "v8.5.0"
15+
appVersion: "v8.5.1"
1616

1717
icon: https://raw.githubusercontent.com/No9/core-dump-handler/master/assets/handle-with-care-svgrepo-com.svg
1818

@@ -29,34 +29,14 @@ maintainers:
2929

3030
annotations:
3131
artifacthub.io/changes: |
32-
- kind: added
33-
description: Support for ARM and MUSL Libraries
34-
links:
35-
- name: Github PR
36-
url: https://github.com/IBM/core-dump-handler/pull/93
3732
- kind: fixed
38-
description: Large config output hangs composer
33+
description: MUSL Build fix
3934
links:
4035
- name: Github Issue
41-
url: https://github.com/No9/libcrio/issues/2
42-
- kind: added
43-
description: Support Podname in template
44-
links:
45-
- name: Github PR
46-
url: https://github.com/IBM/core-dump-handler/pull/92
47-
- kind: fixed
48-
description: Loading order of the .env in composer
49-
links:
50-
- name: Github PR
51-
url: https://github.com/IBM/core-dump-handler/pull/91
52-
- kind: fixed
53-
description: Restrict Security Context Constraints
54-
links:
55-
- name: Github PR
56-
url: https://github.com/IBM/core-dump-handler/pull/90
36+
url: https://github.com/IBM/core-dump-handler/issues/88
5737
artifacthub.io/images: |
5838
- name: core-dump-handler
59-
image: quay.io/icdh/core-dump-handler:v8.5.0
39+
image: quay.io/icdh/core-dump-handler:v8.5.1
6040
artifacthub.io/license: MIT
6141
artifacthub.io/signKey: |
6242
fingerprint: BED079E67FD431E45301B1C9949E671B46AC8A34

charts/core-dump-handler/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ replicaCount: 1
33
image:
44
registry: quay.io
55
repository: icdh/core-dump-handler
6-
tag: v8.5.0
6+
tag: v8.5.1
77
pullPolicy: Always
88
pullSecrets: []
99
request_mem: "64Mi"

0 commit comments

Comments
 (0)