From 1d098eed0eb41762ab07e55c099410ece30f532b Mon Sep 17 00:00:00 2001 From: Cassowary Date: Thu, 9 Nov 2023 10:49:15 -0800 Subject: [PATCH 1/2] Preliminary makefile support for building inside docker --- Makefile | 5 +++++ build-docker-inside.sh | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 build-docker-inside.sh diff --git a/Makefile b/Makefile index 54cb2b51..61df2023 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,11 @@ build-kadabra: build: build-abra build-kadabra +build-docker-abra: + docker run -it -v $(PWD):/abra golang:1.21 bash -c 'cd /abra; ./build-docker-inside.sh' + +build-docker: build-docker-abra + clean: @rm '$(GOPATH)/bin/abra' @rm '$(GOPATH)/bin/kadabra' diff --git a/build-docker-inside.sh b/build-docker-inside.sh new file mode 100755 index 00000000..b90c394e --- /dev/null +++ b/build-docker-inside.sh @@ -0,0 +1,19 @@ +#!/bin/bash +if [ ! -f .envrc ]; then + . .envrc.sample +else + . .envrc +fi +git config --global --add safe.directory /abra # work around funky file permissions + +# fixme for some reason we need to do this +go get coopcloud.tech/abra/pkg/upstream/commandconn +go get github.com/sirupsen/logrus@v1.9.3 +go get github.com/cloudflare/circl/dh/x25519@v1.3.3 +go get github.com/mattn/go-runewidth@v0.0.14 +go get go get coopcloud.tech/abra/pkg/config +go get github.com/mattn/go-colorable@v0.1.12 +go get coopcloud.tech/abra/pkg/config +# + +make build -- 2.40.1 From 20a7cffb71662055f724e850e15eb18b756e13df Mon Sep 17 00:00:00 2001 From: Cassowary Date: Thu, 9 Nov 2023 11:14:41 -0800 Subject: [PATCH 2/2] Fix errors in build-docker-inside.sh --- build-docker-inside.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build-docker-inside.sh b/build-docker-inside.sh index b90c394e..909b25ac 100755 --- a/build-docker-inside.sh +++ b/build-docker-inside.sh @@ -11,7 +11,6 @@ go get coopcloud.tech/abra/pkg/upstream/commandconn go get github.com/sirupsen/logrus@v1.9.3 go get github.com/cloudflare/circl/dh/x25519@v1.3.3 go get github.com/mattn/go-runewidth@v0.0.14 -go get go get coopcloud.tech/abra/pkg/config go get github.com/mattn/go-colorable@v0.1.12 go get coopcloud.tech/abra/pkg/config # -- 2.40.1