Skip to content

Commit 423a069

Browse files
committed
fix input naming
1 parent e506ca7 commit 423a069

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

.github/workflows/docker-builder-reusable.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
required: false
1919
type: string
2020

21-
app_version:
21+
app-version:
2222
default: '0.1.0'
2323
required: false
2424
type: string
@@ -31,18 +31,22 @@ on:
3131
default: 'linux/amd64,linux/arm64'
3232
required: false
3333
type: string
34+
mount-cache-dirs:
35+
description: ""
36+
required: false
37+
type: string
3438

3539
registry:
3640
default: ghcr.io
3741
required: false
3842
type: string
39-
image_name:
43+
image-name:
4044
required: true
4145
type: string
4246
secrets:
43-
registry_username:
47+
registry-username:
4448
required: true
45-
registry_password:
49+
registry-password:
4650
required: true
4751

4852
jobs:
@@ -55,7 +59,7 @@ jobs:
5559
run: |
5660
platforms="${{ inputs.platforms }}"
5761
{
58-
echo "version=${{ inputs.app_version }}-r${{ inputs.revision }}"
62+
echo "version=${{ inputs.app-version }}-r${{ inputs.revision }}"
5963
echo "platforms<<9743a66f914cc249efca164485a19c5c"
6064
echo "[\"${platforms//,/\",\"}\"]"
6165
echo "9743a66f914cc249efca164485a19c5c"
@@ -90,14 +94,14 @@ jobs:
9094
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
9195
with:
9296
registry: ${{ inputs.registry }}
93-
username: ${{ secrets.registry_username }}
94-
password: ${{ secrets.registry_password }}
97+
username: ${{ secrets.registry-username }}
98+
password: ${{ secrets.registry-password }}
9599

96100
- name: Extract Docker metadata
97101
id: meta
98102
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
99103
with:
100-
images: ${{ inputs.registry }}/${{ inputs.image_name }}
104+
images: ${{ inputs.registry }}/${{ inputs.image-name }}
101105
labels: |
102106
org.opencontainers.image.title=${{ inputs.title }}
103107
org.opencontainers.image.description=${{ inputs.description }}
@@ -106,18 +110,18 @@ jobs:
106110
type=ref,event=pr,priority=2999
107111
type=raw,value=latest,enable={{is_default_branch}}
108112
type=raw,enable={{is_default_branch}},value=${{ needs.vars.outputs.version }},priority=1999
109-
type=raw,enable={{is_default_branch}},value=${{ inputs.app_version }},priority=1998
110-
type=semver,enable={{is_default_branch}},value=${{ inputs.app_version }},pattern={{major}}.{{minor}},priority=1997
111-
type=semver,enable={{is_default_branch}},value=${{ inputs.app_version }},pattern={{major}},priority=1996
113+
type=raw,enable={{is_default_branch}},value=${{ inputs.app-version }},priority=1998
114+
type=semver,enable={{is_default_branch}},value=${{ inputs.app-version }},pattern={{major}}.{{minor}},priority=1997
115+
type=semver,enable={{is_default_branch}},value=${{ inputs.app-version }},pattern={{major}},priority=1996
112116
113117
- name: Prepare variables
114118
id: vars
115119
run: |
116120
platform=${{ matrix.platform }}
117121
image=${{ steps.meta.outputs.tags }}
118122
{
119-
echo "platform_pair=${platform//\//-}"
120-
echo "platform_pair_un=${platform//\//_}"
123+
echo "platform-pair=${platform//\//-}"
124+
echo "platform-pair-un=${platform//\//_}"
121125
echo "image=${image%%:*}"
122126
} >> $GITHUB_OUTPUT
123127
@@ -131,5 +135,5 @@ jobs:
131135
platforms: ${{ matrix.platform }}
132136
tags: ${{ steps.meta.outputs.tags }}
133137
labels: ${{ steps.meta.outputs.labels }}
134-
cache-from: type=gha,scope=buildkit-layer-${{ steps.vars.outputs.platform_pair }}
135-
cache-to: type=gha,mode=max,scope=buildkit-layer-${{ steps.vars.outputs.platform_pair }}
138+
cache-from: type=gha,scope=buildkit-layer-${{ steps.vars.outputs.platform-pair }}
139+
cache-to: type=gha,mode=max,scope=buildkit-layer-${{ steps.vars.outputs.platform-pair }}

.github/workflows/docker-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ jobs:
6060
context: containers/${{ matrix.container }}
6161
title: ${{ matrix.container }}
6262
description: ${{ matrix.description }}
63-
app_version: ${{ matrix.app_version }}
63+
app-version: ${{ matrix.app_version }}
6464
revision: ${{ fromJSON(matrix.revision) }}
6565
platforms: ${{ matrix.platforms }}
6666
registry: ghcr.io
67-
image_name: ${{ github.repository }}/${{ matrix.container }}
67+
image-name: ${{ github.repository }}/${{ matrix.container }}
6868
secrets:
69-
registry_username: ${{ github.actor }}
70-
registry_password: ${{ secrets.GITHUB_TOKEN }}
69+
registry-username: ${{ github.actor }}
70+
registry-password: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)