Skip to content

Commit c1b4df7

Browse files
committed
ci: fix build-args references
1 parent 2f7f49c commit c1b4df7

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/container-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ jobs:
3636
uses: ./.github/workflows/verify-image_rw.yml
3737
with:
3838
context_path: "simplerisk-minimal/"
39-
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
39+
dockerfile_path: "simplerisk-minimal/Dockerfile"
4040
image_tag: "simplerisk/simplerisk-minimal:testing"
4141
build_args: "version=8.3"

.github/workflows/push-to-dockerhub_rw.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
description: Is this the latest image?
2828
default: false
2929
type: boolean
30+
build_args:
31+
description: Arguments to use on image at runtime
32+
type: string
3033
secrets:
3134
DOCKER_USERNAME:
3235
required: true
@@ -60,6 +63,7 @@ jobs:
6063
context: ${{ inputs.context_path }}
6164
file: ${{ inputs.dockerfile_path }}
6265
push: ${{ github.event_name != 'pull_request' }}
66+
build-args: ${{ inputs.build_args || '' }}
6367
tags: |
6468
${{ inputs.image_name }}
6569
${{ inputs.image_name }}:${{ inputs.version }}
@@ -72,6 +76,7 @@ jobs:
7276
context: ${{ inputs.context_path }}
7377
file: ${{ inputs.dockerfile_path }}
7478
push: ${{ github.event_name != 'pull_request' }}
79+
build-args: ${{ inputs.build_args || '' }}
7580
tags: |
7681
${{ inputs.image_name }}:${{ inputs.version }}-${{ inputs.os_version }}
7782
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/verify-image_rw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
context: ${{ inputs.context_path }}
2828
file: ${{ inputs.dockerfile_path }}
2929
tags: ${{ inputs.image_tag }}
30-
build_args: ${{ inputs.build_args || '' }}
30+
build-args: ${{ inputs.build_args || '' }}
3131
- name: Run linter with Dockle
3232
uses: erzz/dockle-action@v1
3333
with:

0 commit comments

Comments
 (0)