Makefile: refactors brupop-image target
#418
Conversation
| @@ -36,12 +36,13 @@ BUILDER_IMAGE = public.ecr.aws/bottlerocket/bottlerocket-sdk-$(BOTTLEROCKET_SDK_ | |||
|
|
|||
| export CARGO_HOME = $(TOP)/.cargo | |||
|
|
|||
| image: build brupop-image | |||
| image: check-licenses brupop-image | |||
There was a problem hiding this comment.
Removes the duplicate build step here. No reason to build binaries locally when building the image does the same thing. Calls into the check-license path to ensure licenses are good. This is the default target.
| # Builds, Lints and Tests the Rust workspace | ||
| build: fetch check-licenses | ||
| # Builds, Lints, and Tests the Rust workspace locally | ||
| build: check-licenses |
There was a problem hiding this comment.
check-licenses already does fetch. So removed this duplicate work.
| cargo test --locked | ||
| cargo build --locked |
There was a problem hiding this comment.
Moved building to run after tests have passed.
|
|
||
| brupop-image: fetch check-licenses | ||
| # Builds only the brupop image. Useful target for CI/CD, releasing, etc. | ||
| brupop-image: |
There was a problem hiding this comment.
brupop-image no longer has a dependency on fetch or check-licenses since both depend on the cargo / rust toolchain being available. This ensures that we can build the brupop image in an environment that may not have those tools.
| docker build $(DOCKER_BUILD_FLAGS) \ | ||
| --build-arg UNAME_ARCH="$(UNAME_ARCH)" \ | ||
| --build-arg BUILDER_IMAGE="$(BUILDER_IMAGE)" \ | ||
| --tag "$(IMAGE_NAME)" \ | ||
| --network none \ | ||
| -f Dockerfile . | ||
|
|
||
| dist: brupop-image | ||
| dist: check-licenses brupop-image |
There was a problem hiding this comment.
This target should utilize the check-license / fetch path since it's creating a distribution (and we should ensure we have checked the licenses locally)
Ensures that building the brupop image works without needing to have the rust and cargo toolchain installed. This is useful for release and CI/CD where an environment may not have these tools installed. Signed-off-by: John McBride <jpmmcb@amazon.com>
jpmcb
force-pushed
the
solo-make-target
branch
from
996d1c5
to
fd8403f
Compare
| ADD ./ /src/ | ||
|
|
||
| # Ensure cargo dependencies are fetched and available in the Docker context | ||
| RUN cargo fetch --locked --manifest-path /src/Cargo.toml |
There was a problem hiding this comment.
Fetches sources in docker image to ensure we have necessary upstream code to build locally. This is still dependent on the Cargo.lock, so nothing new should be pulled in here. Note: this requires network access
| docker build $(DOCKER_BUILD_FLAGS) \ | ||
| --build-arg UNAME_ARCH="$(UNAME_ARCH)" \ | ||
| --build-arg BUILDER_IMAGE="$(BUILDER_IMAGE)" \ | ||
| --tag "$(IMAGE_NAME)" \ | ||
| --network none \ |
There was a problem hiding this comment.
Note: in order to fetch cargo sources from crates.io upstream in the image, we need to allow network access. But since this using the lockfile, this should be ok since typically, on the local machine, the sources would be fetched and mounted into the container.
Ensures that building the brupop image works without needing to have the rust and cargo toolchain installed. This is useful for release and CI/CD where an environment may not have these tools installed.
Issue number:
N/a - related to useful changes for releasing brupop
Description of changes:
See comments below for further explanation
Testing done:
Able to run:
make brupop-imagewithout cargo/rust toolchain installedmake, the default target, which builds the image but also checks licenses, fetches sources locally, etcmake buildwhich fetches sources, checks licenses, but builds binaries locally (not in the docker environment or as part of an image)Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.