Combine daemon and cli directories into bin directory

Author: jshufro

Makefile

@@ -2,27 +2,26 @@ VERSION=v$(shell cat shared/version.txt)
 LOCAL_OS=$(shell go env GOOS)-$(shell go env GOARCH)
 
 BUILD_DIR=build
-CLI_DIR=${BUILD_DIR}/${VERSION}/cli
-DAEMON_DIR=${BUILD_DIR}/${VERSION}/daemon
+BIN_DIR=${BUILD_DIR}/${VERSION}/bin
 DOCKER_DIR=${BUILD_DIR}/${VERSION}/docker
 
 CLI_TARGET_OOS:=linux darwin
 ARCHS:=arm64 amd64
 
-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))
+CLI_TARGET_STRINGS:=$(foreach oos,$(CLI_TARGET_OOS), $(foreach arch,$(ARCHS),${BIN_DIR}/rocketpool-cli-$(oos)-$(arch)))
+DAEMON_TARGET_STRINGS:=$(foreach arch,$(ARCHS),${BIN_DIR}/rocketpool-daemon-linux-$(arch))
 
 MODULES:=$(foreach path,$(shell find . -name go.mod),$(dir $(path)))
 MODULE_GLOBS:=$(foreach module,$(MODULES),$(module)...)
 
-cli_deps = ${CLI_DIR}
+cli_deps = ${BIN_DIR}
 ifndef NO_DOCKER
 	cli_deps += docker-builder
 endif
 
 define rocketpool-cli-template
-.PHONY: ${CLI_DIR}/rocketpool-cli-$1-$2
-${CLI_DIR}/rocketpool-cli-$1-$2: ${cli_deps}
+.PHONY: ${BIN_DIR}/rocketpool-cli-$1-$2
+${BIN_DIR}/rocketpool-cli-$1-$2: ${cli_deps}
 	@echo "Building rocketpool-cli-$1-$2"
 ifndef NO_DOCKER
 	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=0 \
@@ -40,27 +39,27 @@ all: ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon lint
 release: ${CLI_TARGET_STRINGS} ${DAEMON_TARGET_STRINGS} ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon
 
 # Target for build/rocketpool-cli which is a symlink to an os-specific build
-${BUILD_DIR}/rocketpool-cli: ${CLI_DIR}/rocketpool-cli-${LOCAL_OS}
-	ln -sf $(shell pwd)/${CLI_DIR}/rocketpool-cli-${LOCAL_OS} ${BUILD_DIR}/rocketpool-cli
+${BUILD_DIR}/rocketpool-cli: ${BIN_DIR}/rocketpool-cli-${LOCAL_OS}
+	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-cli-${LOCAL_OS} ${BUILD_DIR}/rocketpool-cli
 
 
 # Target for build/rocketpool-daemon which is a symlink to an os-specific build
-${BUILD_DIR}/rocketpool-daemon: ${DAEMON_DIR}/rocketpool-daemon-${LOCAL_OS}
-	ln -sf $(shell pwd)/${DAEMON_DIR}/rocketpool-daemon-${LOCAL_OS} ${BUILD_DIR}/rocketpool-daemon
+${BUILD_DIR}/rocketpool-daemon: ${BIN_DIR}/rocketpool-daemon-${LOCAL_OS}
+	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-daemon-${LOCAL_OS} ${BUILD_DIR}/rocketpool-daemon
 
 # docker-builder container
 .PHONY: docker-builder
 docker-builder:
 	VERSION=${VERSION} docker bake -f docker/daemon-bake.hcl builder
 
-daemon_build_deps = ${DAEMON_DIR}
+daemon_build_deps = ${BIN_DIR}
 ifndef NO_DOCKER
 	daemon_build_deps += docker-builder
 endif
 
 # amd64 daemon build
-.PHONY: ${DAEMON_DIR}/rocketpool-daemon-linux-amd64
-${DAEMON_DIR}/rocketpool-daemon-linux-amd64: ${daemon_build_deps}
+.PHONY: ${BIN_DIR}/rocketpool-daemon-linux-amd64
+${BIN_DIR}/rocketpool-daemon-linux-amd64: ${daemon_build_deps}
 ifndef NO_DOCKER
 	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=1 -e CGO_C_FLAGS="-O -D__BLST_PORTABLE__" \
 		-e GOARCH=amd64 -e GOOS=linux --workdir /src -v ~/.cache:/.cache rocketpool/smartnode-builder:${VERSION} \
@@ -70,8 +69,8 @@ else
 endif
 
 # arm64 daemon build
-.PHONY: ${DAEMON_DIR}/rocketpool-daemon-linux-arm64
-${DAEMON_DIR}/rocketpool-daemon-linux-arm64: ${daemon_build_deps}
+.PHONY: ${BIN_DIR}/rocketpool-daemon-linux-arm64
+${BIN_DIR}/rocketpool-daemon-linux-arm64: ${daemon_build_deps}
 ifndef NO_DOCKER
 	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=1 -e CGO_C_FLAGS="-O -D__BLST_PORTABLE__" \
 	-e CC=aarch64-linux-gnu-gcc -e CXX=aarch64-linux-gnu-cpp -e CGO_C_FLAGS="-O -D__BLST_PORTABLE__" -e GOARCH=arm64 -e GOOS=linux \
@@ -81,10 +80,8 @@ else
 	CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_C_FLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build -o $@ rocketpool/rocketpool.go
 endif
 
-${CLI_DIR}:
-	mkdir -p ${CLI_DIR}
-${DAEMON_DIR}:
-	mkdir -p ${DAEMON_DIR}
+${BIN_DIR}:
+	mkdir -p ${BIN_DIR}
 ${DOCKER_DIR}:
 	mkdir -p ${DOCKER_DIR}
 

docker/rocketpool-dockerfile

@@ -32,13 +32,13 @@ COPY ./rocketpool-cli/ /src/rocketpool-cli/
 COPY ./shared/ /src/shared/
 COPY Makefile /src/Makefile
 WORKDIR /src
-RUN --mount=type=cache,target=/root/.cache/go-build make NO_DOCKER=true build/${VERSION}/daemon/rocketpool-daemon-linux-${TARGETARCH}
+RUN --mount=type=cache,target=/root/.cache/go-build make NO_DOCKER=true build/${VERSION}/bin/rocketpool-daemon-linux-${TARGETARCH}
 
 FROM debian:bookworm-slim AS daemon
 ARG TARGETARCH
 ARG VERSION
 
-COPY --from=build /src/build/${VERSION}/daemon/rocketpool-daemon-linux-${TARGETARCH} /go/bin/rocketpool
+COPY --from=build /src/build/${VERSION}/bin/rocketpool-daemon-linux-${TARGETARCH} /go/bin/rocketpool
 
 RUN apt update && apt install ca-certificates -y