Skip to content

Fix docker build #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jshufro wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Draft

Fix docker build #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ${BUILD_DIR}/treegen: ${BIN_DIR}/treegen-${LOCAL_TARGET}
# docker-builder container
.PHONY: docker-builder
docker-builder: ${BUILD_DIR}/docker-buildx-builder
VERSION=${VERSION} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl builder
VERSION=${VERSION} docker buildx --builder smartnode-builder bake -f docker/daemon-bake.hcl builder

bin_deps = ${BIN_DIR}
ifndef NO_DOCKER
Expand Down Expand Up @@ -166,20 +166,20 @@ ${BUILD_DIR}/docker-buildx-builder: ${BUILD_DIR}
.PHONY: docker
docker: ${BUILD_DIR}/docker-buildx-builder
# override the platform so we can load the resulting image into docker
VERSION=${VERSION} ${SOURCE} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.platform=${LOCAL_PLATFORM}"
VERSION=${VERSION} ${SOURCE} docker buildx --builder smartnode-builder bake -f docker/daemon-bake.hcl smartnode --set "smartnode.platform=${LOCAL_PLATFORM}"

.PHONY: docker-push
docker-push: ${BUILD_DIR}/docker-buildx-builder
@echo -n "Building ${VERSION} and publishing containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
# override the output type to push to dockerhub
VERSION=${VERSION} ${SOURCE} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry"
VERSION=${VERSION} ${SOURCE} docker buildx --builder smartnode-builder bake -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry"
@echo "Done!"

.PHONY: docker-latest
docker-latest: ${BUILD_DIR}/docker-buildx-builder
@echo -n "Building ${VERSION}, tagging as latest, and publishing. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
# override the output type to push to dockerhub, and the tags array to tag latest
VERSION=${VERSION} ${SOURCE} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry" --set "smartnode.tags=rocketpool/smartnode:latest"
VERSION=${VERSION} ${SOURCE} docker buildx --builder smartnode-builder bake -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry" --set "smartnode.tags=rocketpool/smartnode:latest"

.PHONY: docker-prune
docker-prune:
Expand Down
4 changes: 2 additions & 2 deletions docker/daemon-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ target "builder" {
]
target = "smartnode_dependencies"
platforms = [ "linux/amd64" ]
output = [{ "type": "docker" }]
output = ["type=docker" ]
}

target "smartnode" {
Expand All @@ -40,5 +40,5 @@ target "smartnode" {
]
target = "smartnode"
platforms = ["linux/amd64", "linux/arm64"]
output = [{ "type": "docker" }]
output = ["type=docker" ]
}
Loading