chore: add docker-build target to Makefile with support for configurable build flags

[gacevicljubisa]

Checklist

• I have read the coding guide.
• My change requires a documentation update, and I have done it.
• I have added tests to cover my changes.
• I have filled out the description and linked the related issues.

Description

This PR introduces a new target, docker-build, in the Makefile, allowing for configurable build flags when creating the Docker image. Specifically, users can now set the REACHABILITY_OVERRIDE_PUBLIC and IMAGE flags, along with other flags as needed, when building the image.

Example of usage:

make docker-build REACHABILITY_OVERRIDE_PUBLIC=true IMAGE=ethersphere/bee:latest

Open API Spec Version Changes (if applicable)

Motivation and Context (Optional)

Related Issue (Optional)

Screenshots (if appropriate):

[gacevicljubisa]

Way to use build flag when creating docker image:

docker build --build-arg REACHABILITY_OVERRIDE_PUBLIC=true -t bee-image-name -f Dockerfile .

[acha-bill]

If we needed to support other flags defined in the makefile here as well, we would end up maintaining variables in 2 places.
Would it work if we exposed the variable in the makefile to the environment so that the value can be passed to make?

makefile

export REACHABILITY_OVERRIDE_PUBLIC ?= false

Then use it with the build arg as you suggested

[gacevicljubisa]

If we needed to support other flags defined in the makefile here as well, we would end up maintaining variables in 2 places. Would it work if we exposed the variable in the makefile to the environment so that the value can be passed to make?

makefile

export REACHABILITY_OVERRIDE_PUBLIC ?= false

Then use it with the build arg as you suggested

we could add this to Makefile:

# Load .env if it exists
ifneq (,$(wildcard ./.env))
	include .env
	export
endif

And if we locally have .env file with the specific flag set to the value. Then no other changes or maintinance is needed.

Another way would be that we have a new target in Makefile that will be responsibile for building the image itself:

docker-build:
	docker build -t $(IMAGE) . --no-cache

And this is example how it can be used:

make docker-build REACHABILITY_OVERRIDE_PUBLIC=true IMAGE=ethersphere/bee:latest

[nugaon]

Another way would be that we have a new target in Makefile that will be responsibile for building the image itself:

I would vote on this option.

having .env variable is error prone between builds.

[acha-bill]

lgtm.
Please rename the PR title

[gacevicljubisa]

Another way would be that we have a new target in Makefile that will be responsibile for building the image itself:

I would vote on this option.

having .env variable is error prone between builds.

@acha-bill @nugaon
Proposed solution will not work without .env file.

The only idea I have now is back to docker build arguments.

@darkobas2 do you have any other better idea?
The con is that we currently need to maintain variables in 2 places.

[darkobas2]

Maybe instead of separate image i would suggest to just build and add an additional binary into the image.... And then it can be chosen at will

[gacevicljubisa]

I discovered an issue when deploying the cluster locally using beelocal. Locally, it always uses the default values defined in the Makefile, whereas on CI, it works as expected, passing the values correctly.

To address this issue and allow building the image with REACHABILITY_OVERRIDE_PUBLIC and BATCHFACTOR_OVERRIDE_PUBLIC, I made the PR in beelocal repo.

Additionally, the old Dockerfile has been left intact so that users can still build the image in the previous way if needed.

These updates should ensure that local deployments work the same way as on CI.

Default Values:

• REACHABILITY_OVERRIDE_PUBLIC: false (default)
• BATCHFACTOR_OVERRIDE_PUBLIC: 5 (default)
• BEE_IMAGE: ethersphere/bee:latest (default Docker image tag)

How to Use:

1. To build the Docker image using default values: Simply run:

   make docker-build

2. To override the default values:

   make docker-build REACHABILITY_OVERRIDE_PUBLIC=true BATCHFACTOR_OVERRIDE_PUBLIC=2 BEE_IMAGE=ethersphere/bee:v1.0

[acha-bill]

LGTM

[nugaon]

LGTM!