Skip to content

Commit 000f2c6

Browse files
committed
Use docker buildx to build docker image
xref: https://community.arm.com/developer/tools-software/tools/b/tools-software-ides-blog/posts/getting-started-with-docker-for-arm-on-linux Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 867a620 commit 000f2c6

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ bin/.container-$(DOTFILE_IMAGE)-%: bin/$(OS)_$(ARCH)/$(BIN) $(DOCKERFILE_%)
215215
-e 's|{RESTIC_VER}|$(RESTIC_VER)|g' \
216216
-e 's|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \
217217
$(DOCKERFILE_$*) > bin/.dockerfile-$*-$(OS)_$(ARCH)
218-
@docker build --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) .
218+
@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS)/$(ARCH) --load --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) .
219219
@docker images -q $(IMAGE):$(TAG_$*) > $@
220220
@echo
221221

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ kmodules.xyz/openshift v0.0.0-20190808144841-c8f9a927f1d1 h1:NmVj5+kPpUgoxRans2X
597597
kmodules.xyz/openshift v0.0.0-20190808144841-c8f9a927f1d1/go.mod h1:+E8HHcxBx6ja4oKOXZ6DCoQ+NjujODTgFOfgOe+ejXw=
598598
kmodules.xyz/webhook-runtime v0.0.0-20190808145328-4186c470d56b h1:yd/uzBgLgsir3X4kGoznJY7CdrkgfznsNKvD4p2xUaQ=
599599
kmodules.xyz/webhook-runtime v0.0.0-20190808145328-4186c470d56b/go.mod h1:X8J6YJvk3NqufXEDqcl2oFuL8T6+mV+AN30/miV4iJU=
600-
kubedb.dev/apimachinery v0.13.0-rc.0 h1:bsVHuz0ZSR1Hf/e7BAMttH1B0YnuV6Z1sGapuD7fr2Y=
600+
kubedb.dev/apimachinery v0.13.0-rc.0 h1:Ar2BVEbJg4X3kPMyO1PnTvN62FulUQnRxT/0Oi3LQ7w=
601601
kubedb.dev/apimachinery v0.13.0-rc.0/go.mod h1:aW9ZyAPYmxM/t9LxtS9H26Ci2bw0qOYlSDHJPuh6lpM=
602602
labix.org/v2/mgo v0.0.0-20140701140051-000000000287/go.mod h1:Lg7AYkt1uXJoR9oeSZ3W/8IXLdvOfIITgZnommstyz4=
603603
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
@@ -606,5 +606,5 @@ sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5
606606
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
607607
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
608608
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
609-
stash.appscode.dev/stash v0.9.0-rc.0 h1:vSSzKdoQWS4hKLd7cVWyL6tkTwH8aVEse4RP7kAe/ec=
609+
stash.appscode.dev/stash v0.9.0-rc.0 h1:GhzBnqHYBgq+2bcuwsDK3nhq2PPEhGkBH0EFAXp2OmY=
610610
stash.appscode.dev/stash v0.9.0-rc.0/go.mod h1:/YjAPx/9E4ScxWea1mbJC6qx9TomhqS83AUy2LufVVk=

vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/galera_arbitrator_config_helper.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@ const (
1818
// GarbdLogFile is the name log file at which Galera Arbitrator Daemon (garbd) puts logs
1919
GarbdLogFile = "/tmp/garb.log"
2020

21-
// GaleraParamsGarbdListenAddr defines an arbitrary listen socket address
22-
// that Galera Arbitrator Daemon (garbd) opens to communicate with the cluster
23-
// https://galeracluster.com/library/documentation/backup-cluster.html
24-
GaleraParamsGarbdListenAddr = "gmcast.listen_addr=tcp://0.0.0.0:" + string(GarbdListenPort)
25-
26-
// SOCAT is needed after completing sst by Galera Arbitrator (garbd)
27-
// SOCATOptionTCPLISTEN is the SOCAT tcp listen option
28-
SOCATOptionTCPLISTEN = "TCP-LISTEN:" + string(GarbdListenPort)
21+
// SOCAT is needed after completing sst by Galera Arbitrator Daemon (garbd)
2922
// SOCATOptionReUseAddr is the SOCAT reuseaddr option
3023
SOCATOptionReUseAddr = "reuseaddr"
3124
// SOCATOptionRetry is the default retry value for `socat` binary
@@ -35,12 +28,15 @@ const (
3528
// ClusterAddressWithListenOption method returns the galera cluster address with
3629
// the listening option (address at which Galera Cluster listens to connections from
3730
// other nodes) for `--address` option in `garbd`
31+
// Here, ‘?gmcast.listen_addr=tcp://0.0.0.0:4444‘ is an arbitrary listen socket address
32+
// that Galera Arbitrator opens to communicate with the cluster.
33+
// https://galeracluster.com/library/documentation/backup-cluster.html
3834
func (g *GaleraArbitratorConfiguration) ClusterAddressWithListenOption() string {
3935
if g == nil {
4036
return ""
4137
}
4238

43-
return fmt.Sprintf("%s?%s", g.Address, GaleraParamsGarbdListenAddr)
39+
return fmt.Sprintf("%s?gmcast.listen_addr=tcp://0.0.0.0:%d", g.Address, GarbdListenPort)
4440
}
4541

4642
// SSTRequestString method form the sst request string
@@ -56,5 +52,5 @@ func (g *GaleraArbitratorConfiguration) SSTRequestString(host string) string {
5652
// SOCATOption returns the option string used for `SOCAT` in the
5753
// percona xtradb backup process
5854
func SOCATOption(retry int32) string {
59-
return fmt.Sprintf("%s,%s,retry=%d", SOCATOptionTCPLISTEN, SOCATOptionReUseAddr, retry)
55+
return fmt.Sprintf("TCP-LISTEN:%d,%s,retry=%d", GarbdListenPort, SOCATOptionReUseAddr, retry)
6056
}

0 commit comments

Comments
 (0)