diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml index 6b2c1a2ec6..e869008014 100644 --- a/.github/workflows/beekeeper.yml +++ b/.github/workflows/beekeeper.yml @@ -13,7 +13,7 @@ env: RUN_TYPE: "PR RUN" SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain" SETUP_CONTRACT_IMAGE_TAG: "0.9.2-rc6" - BEELOCAL_BRANCH: "dev-docker-build" + BEELOCAL_BRANCH: "main" BEEKEEPER_BRANCH: "master" BEEKEEPER_METRICS_ENABLED: false REACHABILITY_OVERRIDE_PUBLIC: true diff --git a/Makefile b/Makefile index 40d4020dd4..4e5fcefef9 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ BEELOCAL_BRANCH ?= main BEEKEEPER_BRANCH ?= master REACHABILITY_OVERRIDE_PUBLIC ?= false BATCHFACTOR_OVERRIDE_PUBLIC ?= 5 -IMAGE ?= ethersphere/bee:latest +BEE_IMAGE ?= ethersphere/bee:latest BEE_API_VERSION ?= "$(shell grep '^ version:' openapi/Swarm.yaml | awk '{print $$2}')" @@ -147,9 +147,9 @@ docker-build: binary @echo "Build flags: $(LDFLAGS)" mkdir -p ./tmp cp ./dist/bee ./tmp/bee - docker build -f Dockerfile.dev -t $(IMAGE) . --no-cache + docker build -f Dockerfile.dev -t $(BEE_IMAGE) . --no-cache rm -rf ./tmp - @echo "Docker image: $(IMAGE)" + @echo "Docker image: $(BEE_IMAGE)" .PHONY: githooks githooks: