feat: add docker buildx, update github actions

lorislab · Feb 2, 2024 · 8f65c7b · 8f65c7b
1 parent cc09bd8
commit 8f65c7b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
@@ -11,13 +11,13 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -10,12 +10,12 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: golangci/golangci-lint-action@v3
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -25,7 +25,7 @@ jobs:
           go build .
           go test
           go clean
-      - uses: goreleaser/goreleaser-action@v4
+      - uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: release --clean --snapshot

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,17 +10,17 @@ jobs:
     name: Release on GitHub
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: golangci/golangci-lint-action@v3
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: goreleaser/goreleaser-action@v4
+      - uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: release --clean

diff --git a/cmd/docker_build.go b/cmd/docker_build.go
@@ -12,6 +12,7 @@ type dockerBuildFlags struct {
 	Profile         string      `mapstructure:"docker-profile"`
 	Context         string      `mapstructure:"docker-context"`
 	Platform        string      `mapstructure:"docker-platform"`
+	BuildX          bool        `mapstructure:"docker-buildx"`
 	SkipDevBuild    bool        `mapstructure:"docker-skip-dev"`
 	SkipPull        bool        `mapstructure:"docker-skip-pull"`
 	BuildPush       bool        `mapstructure:"docker-build-push"`
@@ -39,6 +40,7 @@ func createDockerBuildCmd() *cobra.Command {
 	addStringFlag(cmd, "docker-platform", "", "", "the docker build platform")
 	addBoolFlag(cmd, "docker-skip-pull", "", false, "skip docker pull new images for the build")
 	addBoolFlag(cmd, "docker-build-push", "", false, "push docker image after build")
+	addBoolFlag(cmd, "docker-buildx", "", false, "extended build capabilities with BuildKit")
 	addBoolFlag(cmd, "docker-skip-dev", "", false, "skip build image {{ .Name }}:latest")
 	addBoolFlag(cmd, "docker-remove-intermediate-img-skip", "", false, "skip remove build intermediate containers")
 
@@ -70,6 +72,9 @@ func dockerBuild(project *Project, flags dockerBuildFlags) {
 	log.Info("Build docker image", log.Fields{"image": dockerImage, "tags": tags})
 
 	var command []string
+	if flags.BuildX {
+		command = append(command, "buildx")
+	}
 	command = append(command, "build")
 	if !flags.SkipPull {
 		command = append(command, "--pull")