Skip to content

fix: dockerfile action can't parse BUILKIT_ENABLE in docker env #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iutx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: dockerfile action can't parse BUILKIT_ENABLE in docker env #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions actions/dockerfile/1.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM registry.erda.cloud/retag/buildkit:v0.11.3 AS buildkit
FROM registry.erda.cloud/erda-x/golang:1.22 AS builder
FROM registry.erda.cloud/erda-x/golang:1.24 AS builder

WORKDIR /go/src/github.com/erda-project/erda-actions

Expand All @@ -9,8 +8,13 @@ COPY . .

RUN go build -o /opt/action/run github.com/erda-project/erda-actions/actions/dockerfile/1.0/internal/cmd

FROM registry.erda.cloud/retag/buildkit:v0.11.6 AS buildkit
FROM registry.erda.cloud/retag/docker:20.10.24-cli AS docker-cli
FROM registry.erda.cloud/erda-x/debian-bookworm:12

COPY --from=builder /opt/action/run /opt/action/run
# install docker-cli & buildctl
COPY --from=buildkit /usr/bin/buildctl /usr/bin/buildctl
COPY --from=docker-cli /usr/local/bin/docker /usr/bin/docker

COPY --from=builder /opt/action/run /opt/action/run
RUN chmod +x /opt/action/run
2 changes: 1 addition & 1 deletion actions/dockerfile/1.0/dice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### job 配置项
jobs:
dockerfile:
image: registry.erda.cloud/erda-actions/dockerfile-action:1.0-20240912171845-238b6eec
image: registry.erda.cloud/erda-actions/dockerfile-action:1.0-20251011162630-78f39e63
resources:
cpu: 1
mem: 2048
17 changes: 6 additions & 11 deletions actions/dockerfile/1.0/internal/pkg/build/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ import (
"strings"
"time"

"github.com/erda-project/erda/apistructs"
"github.com/erda-project/erda/pkg/envconf"
"github.com/erda-project/erda/pkg/filehelper"
"github.com/erda-project/erda/pkg/metadata"
"github.com/labstack/gommon/random"
"github.com/pkg/errors"
"github.com/spf13/cast"

"github.com/erda-project/erda-actions/actions/dockerfile/1.0/internal/pkg/conf"
"github.com/erda-project/erda-actions/pkg/docker"
"github.com/erda-project/erda-actions/pkg/dockerfile"
"github.com/erda-project/erda-actions/pkg/pack"
"github.com/erda-project/erda/apistructs"
"github.com/erda-project/erda/pkg/envconf"
"github.com/erda-project/erda/pkg/filehelper"
"github.com/erda-project/erda/pkg/metadata"
)

type Builder interface {
Expand Down Expand Up @@ -107,13 +108,7 @@ func packAndPushImage(cfg conf.Conf) error {

var builder Builder

isBuildkitEnable, err := strconv.ParseBool(cfg.BuildkitEnable)
if err != nil {
fmt.Fprintf(os.Stdout, "unparsed builder keyword: %v\n", err)
return err
}

if isBuildkitEnable {
if cast.ToBool(cfg.BuildkitEnable) {
Copy link
Member

@sfwn sfwn Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about set the type of cfg.BuildkitEnable to bool directly? Or you should add unit test to clarify the bad case.

builder = NewBuildkit(&cfg)
} else {
builder = NewDocker(&cfg)
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
github.com/shogo82148/androidbinary v1.0.2
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cast v1.7.1
github.com/stretchr/testify v1.10.0
github.com/thedevsaddam/gojsonq/v2 v2.5.2
golang.org/x/crypto v0.25.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,8 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
Expand Down