diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml index 7303444..7eeab7a 100644 --- a/.woodpecker/build-container.yml +++ b/.woodpecker/build-container.yml @@ -7,7 +7,7 @@ when: steps: dryrun: - image: quay.io/thegeeklab/wp-docker-buildx:1 + image: quay.io/thegeeklab/wp-docker-buildx:1.0.2 settings: containerfile: Containerfile.multiarch dry_run: true @@ -21,7 +21,7 @@ steps: publish-dockerhub: group: container - image: quay.io/thegeeklab/wp-docker-buildx:1 + image: quay.io/thegeeklab/wp-docker-buildx:1.0.2 settings: auto_tag: true containerfile: Containerfile.multiarch @@ -42,7 +42,7 @@ steps: publish-quay: group: container - image: quay.io/thegeeklab/wp-docker-buildx:1 + image: quay.io/thegeeklab/wp-docker-buildx:1.0.2 settings: auto_tag: true containerfile: Containerfile.multiarch diff --git a/_docs/data/data.yaml b/_docs/data/data.yaml index 2791fe5..efc2b38 100644 --- a/_docs/data/data.yaml +++ b/_docs/data/data.yaml @@ -95,7 +95,6 @@ properties: By default the Docker daemon will push five layers of an image at a time. If you are on a low bandwidth connection this may cause timeout issues and you may want to lower with this option. type: string - defaultValue: 5 required: false - name: containerfile diff --git a/cmd/wp-docker-buildx/config.go b/cmd/wp-docker-buildx/config.go index 2367352..46fd5b4 100644 --- a/cmd/wp-docker-buildx/config.go +++ b/cmd/wp-docker-buildx/config.go @@ -125,8 +125,8 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag { &cli.StringFlag{ Name: "containerfile", EnvVars: []string{"PLUGIN_CONTAINERFILE"}, - Usage: "max concurrent uploads", - Value: "5", + Usage: "containerfile to use for the image build", + Value: "Containerfile", Destination: &settings.Build.Containerfile, Category: category, }, diff --git a/plugin/docker.go b/plugin/docker.go index 9b4e086..9bf3de0 100644 --- a/plugin/docker.go +++ b/plugin/docker.go @@ -214,7 +214,6 @@ func hasProxyBuildArg(build *Build, key string) bool { func commandDaemon(daemon Daemon) *execabs.Cmd { args := []string{ "--data-root", daemon.StoragePath, - "--max-concurrent-uploads", daemon.MaxConcurrentUploads, "--host=unix:///var/run/docker.sock", } @@ -254,6 +253,10 @@ func commandDaemon(daemon Daemon) *execabs.Cmd { args = append(args, "--experimental") } + if daemon.MaxConcurrentUploads != "" { + args = append(args, "--max-concurrent-uploads", daemon.MaxConcurrentUploads) + } + return execabs.Command(dockerdBin, args...) }