Rework docker builds to better match fornax's workflow

Author: jshufro

Makefile

@@ -4,6 +4,7 @@ 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
+DOCKER_DIR=${BUILD_DIR}/${VERSION}/docker
 
 CLI_TARGET_OOS:=linux darwin
 ARCHS:=arm64 amd64
@@ -25,7 +26,7 @@ endef
 all: ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon lint
 
 .PHONY: release
-release: clean docker ${CLI_TARGET_STRINGS} ${DAEMON_TARGET_STRINGS} ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon
+release: clean ${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}
@@ -73,18 +74,40 @@ ${CLI_DIR}:
 	mkdir -p ${CLI_DIR}
 ${DAEMON_DIR}:
 	mkdir -p ${DAEMON_DIR}
+${DOCKER_DIR}:
+	mkdir -p ${DOCKER_DIR}
 
 $(foreach oos,$(CLI_TARGET_OOS),$(foreach arch,$(ARCHS),$(eval $(call rocketpool-cli-template,$(oos),$(arch)))))
 
 
 # Docker containers
 .PHONY: docker
-docker:
+docker: ${DOCKER_DIR}
+	VERSION=${VERSION} docker bake -f docker/daemon-bake.hcl daemon
+
+.PHONY: docker-load
+docker-load: docker
+	docker import - smartnode:${VERSION}-amd64 < ${DOCKER_DIR}/smartnode:${VERSION}-amd64.tar
+	docker import - smartnode:${VERSION}-arm64 < ${DOCKER_DIR}/smartnode:${VERSION}-arm64.tar
+
+.PHONY: docker-push
+docker-push: docker-load
+	echo
+	echo -n "Publishing smartnode:${VERSION} containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
+	docker push rocketpool/smartnode:${VERSION}-amd64
+	docker push rocketpool/smartnode:${VERSION}-arm64
+	echo "Done!"
+
+.PHONY: docker-latest
+docker-latest: docker-push
+	echo
+	echo -n "Publishing smartnode:${VERSION} as latest. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
 	rm -rf ~/.docker/manifests/docker.io_rocketpool_smartnode-latest
 	rm -rf ~/.docker/manifests/docker.io_rocketpool_smartnode-${VERSION}
-	VERSION=${VERSION} docker bake -f docker/daemon-bake.hcl daemon
 	docker manifest create rocketpool/smartnode:${VERSION} --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
 	docker manifest create rocketpool/smartnode:latest --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
+	docker manifest push --purge rocketpool/smartnode:${VERSION}
+	docker manifest push --purge rocketpool/smartnode:latest
 
 define lint-template 
 .PHONY: lint-$1

README.md

@@ -34,8 +34,13 @@ A [Makefile](./Makefile) is included for building, testing, and linting.
   * It will tag docker images as latest as well as the version in `shared/version.txt`
   * It will put cli and native mode binaries in build/\<version\>
 * `make build/rocketpool-cli` builds just the cli
+  * The cli is always built natively.
 * `make build/rocketpool-daemon` builds just the daemon
-* `make docker` builds the rocketpool/smartnode container and tags it with latest as well as the version from `shared/version.txt`
+  * The daemon is built in docker, unless you run `make NO_DOCKER=true \<cmd\>`
+* `make docker` builds the rocketpool/smartnode containers for all supported architectures and saves them in build/\<version\>/docker
+* `make docker-load` builds and loads the smartnode containers.
+* `make docker-publish` builds, loads, and pushes the smartnode containers.
+* `make docker-latest` builds, loads, pushes, tags as latest, and creates a multi-arch manifest, which is also pushed.
 * `make lint` runs the linter.
 * `make test` runs all unit tests.
 * `make clean` deletes any binaries. It does not clear your go caches. It does not clean up old docker images.

docker/daemon-bake.hcl

@@ -31,4 +31,5 @@ target "daemon" {
   }
   target = "daemon"
   platform = "linux/${arch}"
+  output = [{ "type": "tar", "dest": "build/${VERSION}/docker/smartnode:${VERSION}-${arch}.tar" }]
 }