update build scripts to support treegen

Author: jshufro

Makefile

@@ -1,10 +1,14 @@
 BUILD_DIR=build
 CLI_DIR=${BUILD_DIR}/cli
 DAEMON_DIR=${BUILD_DIR}/daemon
+TREEGEN_DIR=${BUILD_DIR}/treegen
 
 CLI_TARGET_OOS:=linux darwin
 ARCHS:=arm64 amd64
 
+DOCKER_RUN_CMD=docker run --env OWNER=$(shell id -u):$(shell id -g) --rm -v /tmp/docker-go-build:/root/.cache/go-build 
+DOCKER_BUILDER_TAG=rocketpool/smartnode-builder:latest
+
 CLI_TARGET_STRINGS:=$(foreach oos,$(CLI_TARGET_OOS), $(foreach arch,$(ARCHS),${CLI_DIR}/rocketpool-cli-$(oos)-$(arch)))
 DAEMON_TARGET_STRINGS:=$(foreach arch,$(ARCHS),${DAEMON_DIR}/rocketpool-daemon-linux-$(arch))
 
@@ -21,18 +25,33 @@ endef
 .PHONY: all
 all: lint rocketpool-cli rocketpool-daemon
 
+.PHONY: docker-builder
+docker-builder: docker/smartnode-builder
+	docker build -t $(DOCKER_BUILDER_TAG) -f docker/smartnode-builder .
+
 .PHONY: rocketpool-cli
 rocketpool-cli: $(CLI_TARGET_STRINGS)
 
 .PHONY: rocketpool-daemon
-rocketpool-daemon: ${DAEMON_DIR}
-	docker build -t rocketpool/smartnode-builder:latest -f docker/smartnode-builder .
-	docker run --env OWNER=$(shell id -u):$(shell id -g) --rm -v $(PWD):/src -v $(PWD)/${DAEMON_DIR}:/out -v /tmp/docker-go-build:/root/.cache/go-build rocketpool/smartnode-builder:latest /src/rocketpool/build.sh
+rocketpool-daemon: ${DAEMON_DIR} docker-builder
+	$(DOCKER_RUN_CMD) -v $(PWD):/src -v $(PWD)/${DAEMON_DIR}:/out ${DOCKER_BUILDER_TAG} /src/rocketpool/build.sh
+.PHONY: treegen-bin
+treegen-bin: ${TREEGEN_DIR}/treegen-linux-amd64 ${TREEGEN_DIR}/treegen-linux-arm64
+.PHONY: treegen-docker
+treegen-container: treegen-bin
+	./treegen/build-release.sh -a -v $(TREEGEN_VERSION)
+.PHONY: treegen-container-push
+treegen-container-push: treegen-container
+	./treegen/build-release.sh -p -a -v $(TREEGEN_VERSION)
 
 ${CLI_DIR}:
 	mkdir -p ${CLI_DIR}
 ${DAEMON_DIR}:
 	mkdir -p ${DAEMON_DIR}
+${TREEGEN_DIR}:
+	mkdir -p ${TREEGEN_DIR}
+${TREEGEN_DIR}/treegen-linux-amd64 ${TREEGEN_DIR}/treegen-linux-arm64: $(shell find treegen -name "*.go") treegen/go.mod docker-builder
+	$(DOCKER_RUN_CMD) -v $(PWD):/src -v $(PWD)/${TREEGEN_DIR}:/out ${DOCKER_BUILDER_TAG} /src/treegen/build_binaries.sh
 
 $(foreach oos,$(CLI_TARGET_OOS),$(foreach arch,$(ARCHS),$(eval $(call rocketpool-cli-template,$(oos),$(arch)))))
 

README.md

@@ -31,6 +31,7 @@ A [Makefile](./Makefile) is included for building, testing, and linting.
 * `make all` will build rocketpool-cli, rocketpool-daemon, and run the linter.
 * `make rocketpool-daemon` will build the docker containers required to build the daemon, then build the daemon.
 * `make rocketpool-cli` will build the cli for linux and osx.
+* `make treegen-bin` makes treegen binaries, `make treegen-docker` makes docker images with those binaries, and `make treegen-container-push` pushes them to docker hub.
 * `make test` runs all unit tests.
 * `make clean` deletes any binaries. It does not clear your go caches.
 

docker/treegen

@@ -0,0 +1,4 @@
+FROM debian:bookworm-slim
+
+ARG TARGETARCH
+COPY ./build/treegen/treegen-linux-${TARGETARCH} /treegen

treegen/Dockerfile

@@ -1,33 +1,33 @@
 #!/bin/bash
 
-# Builds the binaries
-build_binary() {
-    echo -n "Building binaries... "
-    docker run --rm -v $PWD:/treegen rocketpool/smartnode-builder:latest /treegen/build_binaries.sh
-    echo "done!"
-}
-
 # Build the images
 build_docker() {
+    local PUSH=$1
     echo -n "Building Docker images... "
-    docker buildx build --platform=linux/amd64 -t rocketpool/treegen:$VERSION-amd64 --load .
-    docker buildx build --platform=linux/arm64 -t rocketpool/treegen:$VERSION-arm64 --load .
-    docker push rocketpool/treegen:$VERSION-amd64
-    docker push rocketpool/treegen:$VERSION-arm64
+    docker buildx build --no-cache --progress=plain --platform=linux/amd64 -t rocketpool/treegen:$VERSION-amd64 --load -f ./docker/treegen .
+    docker buildx build --platform=linux/arm64 -t rocketpool/treegen:$VERSION-arm64 --load -f ./docker/treegen .
+    if [ "$PUSH" = "true" ]; then
+        echo -n "Pushing to Docker Hub... "
+        docker push rocketpool/treegen:$VERSION-amd64
+        docker push rocketpool/treegen:$VERSION-arm64
+    fi
     echo "done!"
 }
 
 # Build the manifest
 build_manifest() {
+    local PUSH=$1
     echo -n "Building Docker manifest... "
     rm -f ~/.docker/manifests/docker.io_rocketpool_treegen-$VERSION
     rm -f ~/.docker/manifests/docker.io_rocketpool_treegen-latest
     docker manifest create rocketpool/treegen:$VERSION --amend rocketpool/treegen:$VERSION-amd64 --amend rocketpool/treegen:$VERSION-arm64
     docker manifest create rocketpool/treegen:latest --amend rocketpool/treegen:$VERSION-amd64 --amend rocketpool/treegen:$VERSION-arm64
     echo "done!"
-    echo -n "Pushing to Docker Hub... "
-    docker manifest push --purge rocketpool/treegen:$VERSION
-    docker manifest push --purge rocketpool/treegen:latest
+    if [ "$PUSH" = "true" ]; then
+        echo -n "Pushing to Docker Hub... "
+        docker manifest push --purge rocketpool/treegen:$VERSION
+        docker manifest push --purge rocketpool/treegen:latest
+    fi
     echo "done!"
 }
 
@@ -37,9 +37,9 @@ usage() {
     echo "This script builds treegen's artifacts."
     echo "Options:"
     echo $'\t-a\tBuild all of the artifacts.'
-    echo $'\t-b\tBuild the native binaries for most Linux distributions'
     echo $'\t-d\tBuild the Alpine-based Docker containers'
     echo $'\t-m\tBuild the Docker manifest'
+    echo $'\t-p\tPush the docker manifests and/or containers'
     exit 0
 }
 
@@ -48,12 +48,12 @@ usage() {
 # =================
 
 # Get the version
-while getopts "abdmv:" FLAG; do
+while getopts "admpv:" FLAG; do
     case "$FLAG" in
-        a) BINARIES=true DOCKER=true MANIFEST=true ;;
-        b) BINARIES=true ;;
+        a) DOCKER=true MANIFEST=true ;;
         d) DOCKER=true ;;
         m) MANIFEST=true ;;
+	p) PUSH=true ;;
         v) VERSION="$OPTARG" ;;
         *) usage ;;
     esac
@@ -63,12 +63,9 @@ if [ -z "$VERSION" ]; then
 fi
 
 # Build the artifacts
-if [ "$BINARIES" = true ]; then
-    build_binary
-fi
 if [ "$DOCKER" = true ]; then
-    build_docker
+    build_docker $PUSH
 fi
 if [ "$MANIFEST" = true ]; then
-    build_manifest
+    build_manifest $PUSH
 fi

treegen/build-release.sh

@@ -1,11 +1,17 @@
 #!/bin/bash
 
-cd /treegen
+cd $(dirname $0)
 
 export CGO_ENABLED=1
 
 # Build x64 version
-CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=amd64 GOOS=linux go build -o Releases/treegen-linux-amd64 -buildvcs=false
+CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=amd64 GOOS=linux go build -o /out/treegen-linux-amd64 -buildvcs=false
 
 # Build the arm64 version
-CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build -o Releases/treegen-linux-arm64 -buildvcs=false
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build -o /out/treegen-linux-arm64 -buildvcs=false
+
+if [ -z "${OWNER}" ]; then
+	exit 0
+fi
+
+chown ${OWNER} /out/*