diff --git a/.woodpecker.yml b/.woodpecker.yml index 574c18c..670beb6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,7 +7,8 @@ when: variables: - &golang "golang:1.21" - - &build_plugin "woodpeckerci/plugin-docker-buildx:pull_130" + # - &build_plugin "woodpeckerci/plugin-docker-buildx:pull_130" + - &build_plugin "woodpeckerci/plugin-docker-buildx:3.0.0" - base_settings: &base_buildx_settings platforms: "linux/amd64,linux/arm64" dockerfile: Dockerfile.multiarch @@ -76,6 +77,7 @@ steps: publish_pr_image: image: *build_plugin + pull: true depends_on: test settings: <<: *base_buildx_settings diff --git a/plugin/docker.go b/plugin/docker.go index cc18db1..44213f8 100644 --- a/plugin/docker.go +++ b/plugin/docker.go @@ -2,14 +2,12 @@ package plugin import ( "fmt" - "log" "os" "os/exec" "strconv" "strings" "time" - "github.com/go-git/go-git/v5" "github.com/urfave/cli/v2" ) @@ -69,23 +67,8 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd { } // determine git epoch to define SOURCE_DATE_EPOCH build_arg - r, err := git.PlainOpen(".") - if err != nil { - log.Fatal(err) - } - ref, err := r.Head() - if err != nil { - log.Fatal(err) - } - iter, err := r.Log(&git.LogOptions{From: ref.Hash()}) - if err != nil { - log.Fatal(err) - } - commit, err := iter.Next() - if err != nil { - log.Fatal(err) - } - build.Epoch = commit.Author.When.Unix() + now := time.Now() + build.Epoch = now.Unix() args = append(args, build.Context) if !dryrun {