From 0ee07884e1ae103624968d6f766bdb3f5979d933 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Fri, 10 Feb 2023 06:20:44 -0500 Subject: [PATCH] Sync Docker build process on v0.37.x with main (#295) Signed-off-by: Thane Thomson --- .github/workflows/cometbft-docker.yml | 4 ++-- Makefile | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cometbft-docker.yml b/.github/workflows/cometbft-docker.yml index a3e9606d7..95496626d 100644 --- a/.github/workflows/cometbft-docker.yml +++ b/.github/workflows/cometbft-docker.yml @@ -1,5 +1,5 @@ name: Docker -# Build & Push rebuilds the CometBFT docker image on every push to main and creation of tags +# Rebuilds the CometBFT docker image on every push to main and creation of tags # and pushes the image to https://hub.docker.com/r/cometbft/cometbft on: push: @@ -33,7 +33,7 @@ jobs: if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}" fi - echo ::set-output name=tags::${TAGS} + echo "tags=${TAGS}" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@master diff --git a/Makefile b/Makefile index 93748ba1d..5f69579f5 100644 --- a/Makefile +++ b/Makefile @@ -294,10 +294,13 @@ check-docs-toc: ### Docker image ### ############################################################################### -build-docker: build-linux - cp $(OUTPUT) DOCKER/cometbft - docker build --label=cometbft --tag="cometbft/cometbft" DOCKER - rm -rf DOCKER/cometbft +# On Linux, you may need to run `DOCKER_BUILDKIT=1 make build-docker` for this +# to work. +build-docker: + docker build \ + --label=cometbft \ + --tag="cometbft/cometbft" \ + -f DOCKER/Dockerfile . .PHONY: build-docker ###############################################################################