From 338b28aa7193732e1721012e184e124c0f0aaae5 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 19:21:56 +0100 Subject: [PATCH 1/9] Add build args --- .gitea/workflows/build.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 24c293d..d3e4ece 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -15,6 +15,10 @@ on: required: false type: string default: ${{ vars.REGISTRY_PASSWORD }} + build-args: + required: false + type: string + default: "" jobs: build: @@ -34,6 +38,13 @@ jobs: username: ${{ inputs.username }} password: ${{ inputs.password }} - name: Build - run: docker build . -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ inputs.tag }} -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ gitea.sha }} + run: | + BUILD_ARGS="" + while IFS= read -r line; do + BUILD_ARGS+=" --build-arg $line" + done <<< "${{ inputs.build-args }}" + docker build . $BUILD_ARGS \ + -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ inputs.tag }} \ + -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ gitea.sha }} - name: Push run: docker push ${{ vars.REGISTRY }}/${{ gitea.repository }} --all-tags -- 2.47.2 From b932234ac860395bb4cee641e08bf4d3f8148326 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 19:24:58 +0100 Subject: [PATCH 2/9] ci --- .gitea/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d3e4ece..333baab 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,9 +40,11 @@ jobs: - name: Build run: | BUILD_ARGS="" - while IFS= read -r line; do - BUILD_ARGS+=" --build-arg $line" - done <<< "${{ inputs.build-args }}" + echo "${{ inputs.build_args }}" | while IFS= read -r line; do + if [[ ! -z "$line" ]]; then + BUILD_ARGS+=" --build-arg $line" + fi + done docker build . $BUILD_ARGS \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ inputs.tag }} \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ gitea.sha }} -- 2.47.2 From 5b756b282872747d01172dc754ad4595ca38a3b1 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 19:29:06 +0100 Subject: [PATCH 3/9] add test echo --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 333baab..2f3a323 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -45,6 +45,7 @@ jobs: BUILD_ARGS+=" --build-arg $line" fi done + echo "$BUILD_ARGS" docker build . $BUILD_ARGS \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ inputs.tag }} \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ gitea.sha }} -- 2.47.2 From 9a3ce00d9e960fc694f353bb1462ab0ccc8cf8aa Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 20:07:44 +0100 Subject: [PATCH 4/9] fix typo --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 2f3a323..8e2da6c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - name: Build run: | BUILD_ARGS="" - echo "${{ inputs.build_args }}" | while IFS= read -r line; do + echo "${{ inputs.build-args }}" | while IFS= read -r line; do if [[ ! -z "$line" ]]; then BUILD_ARGS+=" --build-arg $line" fi -- 2.47.2 From b4ae8dae1c0a4f636acf3a578e8a8b804acd5ecc Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 20:10:02 +0100 Subject: [PATCH 5/9] fix syntax --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 8e2da6c..a37b946 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -42,7 +42,7 @@ jobs: BUILD_ARGS="" echo "${{ inputs.build-args }}" | while IFS= read -r line; do if [[ ! -z "$line" ]]; then - BUILD_ARGS+=" --build-arg $line" + BUILD_ARGS="$BUILD_ARGS --build-arg $line" fi done echo "$BUILD_ARGS" -- 2.47.2 From 265b358761ee7dd80057890ecafb4ab2fdfa1b37 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 20:16:52 +0100 Subject: [PATCH 6/9] fix syntax --- .gitea/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index a37b946..74b6451 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -41,11 +41,11 @@ jobs: run: | BUILD_ARGS="" echo "${{ inputs.build-args }}" | while IFS= read -r line; do - if [[ ! -z "$line" ]]; then + if [ -n "$line" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg $line" fi done - echo "$BUILD_ARGS" + echo "Final BUILD_ARGS: $BUILD_ARGS" docker build . $BUILD_ARGS \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ inputs.tag }} \ -t ${{ vars.REGISTRY }}/${{ gitea.repository }}:${{ gitea.sha }} -- 2.47.2 From 5e7a26d64fdb28930803ad6a83cc04166648ee8a Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 20:22:57 +0100 Subject: [PATCH 7/9] debug --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 74b6451..b8f8cd2 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -41,6 +41,7 @@ jobs: run: | BUILD_ARGS="" echo "${{ inputs.build-args }}" | while IFS= read -r line; do + echo "LINE CONTENT: $line" if [ -n "$line" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg $line" fi -- 2.47.2 From 619c28343ad722893ca14f45cb7590471e93c488 Mon Sep 17 00:00:00 2001 From: Jamie Schouten Date: Mon, 3 Mar 2025 20:27:06 +0100 Subject: [PATCH 8/9] debug --- .gitea/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index b8f8cd2..5e9893c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,12 +40,14 @@ jobs: - name: Build run: | BUILD_ARGS="" - echo "${{ inputs.build-args }}" | while IFS= read -r line; do + while IFS= read -r line; do echo "LINE CONTENT: $line" if [ -n "$line" ]; then - BUILD_ARGS="$BUILD_ARGS --build-arg $line" + BUILD_ARGS="$BUILD_ARGS --build-arg $line" fi - done + done < Date: Mon, 3 Mar 2025 20:38:50 +0100 Subject: [PATCH 9/9] Update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5627de5..0da5e67 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ jobs: tag: v1.0.0 username: my-docker-username password: ${{ secrets.DOCKER_PASSWORD }} + build-args: | + PHP_VERSION=8.4 ``` ### Input Parameters -- 2.47.2