From 48aa44fa17ca2b4fd306fea2edb3f664f9ff2457 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 19:11:41 +0000 Subject: [PATCH 01/10] fix: Dockerfile name parameter --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 6e89097..15b0197 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -27,5 +27,5 @@ cat < "$DOCKER_CONFIG/config.json" } EOF buildctl build "$@" -o "type=image,name=$IMAGEAPP,push=true" \ - --local context="$(dirname "$INPUT_DOCKERFILE")" \ - --local dockerfile="$INPUT_DOCKERFILE" + --frontend-opt filename="$INPUT_DOCKERFILE" \ + --local context="$(dirname "$INPUT_DOCKERFILE")" From 626714fe063915e0c62f457f952ba1709db0ca70 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 19:12:58 +0000 Subject: [PATCH 02/10] fix: frontend-opt -> opt --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 15b0197..163c56e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -27,5 +27,5 @@ cat < "$DOCKER_CONFIG/config.json" } EOF buildctl build "$@" -o "type=image,name=$IMAGEAPP,push=true" \ - --frontend-opt filename="$INPUT_DOCKERFILE" \ + --opt filename="$INPUT_DOCKERFILE" \ --local context="$(dirname "$INPUT_DOCKERFILE")" From 1ef5ead38104fbd52245c1e60a0ccfc12c585234 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 19:15:45 +0000 Subject: [PATCH 03/10] fix: --frontend mandatory if --opt --- entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 163c56e..8e7767e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -26,6 +26,7 @@ cat < "$DOCKER_CONFIG/config.json" } } EOF -buildctl build "$@" -o "type=image,name=$IMAGEAPP,push=true" \ +buildctl build --frontend dockerfile.v0 "$@" \ + -o "type=image,name=$IMAGEAPP,push=true" \ --opt filename="$INPUT_DOCKERFILE" \ --local context="$(dirname "$INPUT_DOCKERFILE")" From 3d548f8bcc7afe9b1bbee25357d39818503e4442 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 19:52:06 +0000 Subject: [PATCH 04/10] fix: use of buildctl-daemonless.sh --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 8e7767e..76dce5e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -26,7 +26,7 @@ cat < "$DOCKER_CONFIG/config.json" } } EOF -buildctl build --frontend dockerfile.v0 "$@" \ +buildctl-daemonless.sh build --frontend dockerfile.v0 "$@" \ -o "type=image,name=$IMAGEAPP,push=true" \ --opt filename="$INPUT_DOCKERFILE" \ --local context="$(dirname "$INPUT_DOCKERFILE")" From 4af4a54dbe9d2883bb223f83856639af32d1634b Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 19:54:02 +0000 Subject: [PATCH 05/10] fix: remove -rootless --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae30e1e..840c576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM docker.io/moby/buildkit:v0.25.1-rootless +FROM docker.io/moby/buildkit:v0.25.1 COPY entrypoint.sh /usr/local/bin/ ENTRYPOINT ["entrypoint.sh"] From 80be42f6153d2d5693eed2f95e34b9b3554c28bb Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 20:14:29 +0000 Subject: [PATCH 06/10] fix: image cache name --- entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 76dce5e..02697db 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,13 +7,13 @@ mkdir -p "$DOCKER_CONFIG" [ -f .env ] && . ./.env if [ -z "$IMAGEAPP" ]; then - REGISTRY="$(echo "$GITHUB_SERVER_URL" | sed 's .*:// ')" - IMAGEAPP="$REGISTRY/$INPUT_IMAGE" + IMAGEAPP="${GITHUB_SERVER_URL#*://}/$INPUT_IMAGE" fi if [ "$INPUT_CACHE" = true ]; then - set -- --import-cache "type=registry,ref=$IMAGEAPP/cache" \ - --export-cache "type=registry,ref=$IMAGEAPP/cache" + IMAGECACHE="${IMAGEAPP%:*}/cache" + set -- --import-cache "type=registry,ref=$IMAGECACHE" \ + --export-cache "type=registry,ref=$IMAGECACHE" fi cat < "$DOCKER_CONFIG/config.json" From 98408236337bea4753c22414f1c77ab851fcbb90 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 21 Oct 2025 20:20:56 +0000 Subject: [PATCH 07/10] fix: missing dockerfile path --- entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 02697db..f4436f3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -26,7 +26,9 @@ cat < "$DOCKER_CONFIG/config.json" } } EOF + +DIR="$(dirname "$INPUT_DOCKERFILE")" buildctl-daemonless.sh build --frontend dockerfile.v0 "$@" \ -o "type=image,name=$IMAGEAPP,push=true" \ --opt filename="$INPUT_DOCKERFILE" \ - --local context="$(dirname "$INPUT_DOCKERFILE")" + --local context="$DIR" --local dockerfile="$DIR" From 307b13b2cc2af8d1ba4b815a86d2859bf69ef40a Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 22 Oct 2025 03:59:52 +0000 Subject: [PATCH 08/10] debug --- entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index f4436f3..4bcf225 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e export DOCKER_CONFIG="$HOME/.docker" mkdir -p "$DOCKER_CONFIG" @@ -28,6 +28,9 @@ cat < "$DOCKER_CONFIG/config.json" EOF DIR="$(dirname "$INPUT_DOCKERFILE")" + +set -x +find . buildctl-daemonless.sh build --frontend dockerfile.v0 "$@" \ -o "type=image,name=$IMAGEAPP,push=true" \ --opt filename="$INPUT_DOCKERFILE" \ From c9bce255f15972c76d33bda2160bb8abeb4b43aa Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 22 Oct 2025 04:01:45 +0000 Subject: [PATCH 09/10] fix: Dockerfile filename --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 4bcf225..37fbefd 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -33,5 +33,5 @@ set -x find . buildctl-daemonless.sh build --frontend dockerfile.v0 "$@" \ -o "type=image,name=$IMAGEAPP,push=true" \ - --opt filename="$INPUT_DOCKERFILE" \ + --opt filename="$(basename "$INPUT_DOCKERFILE")" \ --local context="$DIR" --local dockerfile="$DIR" From bafbb86b7ec2a84e4e216c0b40c6b6cbed44572f Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 22 Oct 2025 04:03:41 +0000 Subject: [PATCH 10/10] fix: remove debug --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 37fbefd..f649b42 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -28,10 +28,10 @@ cat < "$DOCKER_CONFIG/config.json" EOF DIR="$(dirname "$INPUT_DOCKERFILE")" +FILENAME="$(basename "$INPUT_DOCKERFILE")" set -x -find . buildctl-daemonless.sh build --frontend dockerfile.v0 "$@" \ -o "type=image,name=$IMAGEAPP,push=true" \ - --opt filename="$(basename "$INPUT_DOCKERFILE")" \ + --opt filename="$FILENAME" \ --local context="$DIR" --local dockerfile="$DIR"