Skip to content

Commit

Permalink
Add make CLI tool
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Apr 14, 2021
1 parent 51b2f9d commit f3c44c3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ All user visible changes to this project will be documented in this file. This p



## [2.2.0-ndkr22b-rust1.51-r1] · 2021-04-14
[2.2.0-ndkr22b-rust1.51-r1]: /../../tree/2.2.0-ndkr22b-rust1.51-r1

[Diff](/../../compare/2.2.0-ndkr22b-rust1.51-r0...2.2.0-ndkr22b-rust1.51-r1)

### Added

- [`make`] CLI tool.




## [2.2.0-ndkr22b-rust1.51-r0] · 2021-04-06
[2.2.0-ndkr22b-rust1.51-r0]: /../../tree/2.2.0-ndkr22b-rust1.51-r0

Expand Down Expand Up @@ -40,3 +52,5 @@ All user visible changes to this project will be documented in this file. This p
[cargo-ndk]: https://crates.io/crates/cargo-ndk
[Rust]: https://www.rust-lang.org
[Semantic Versioning 2.0.0]: https://semver.org

[`make`]: https://www.gnu.org/software/make/manual/make.html
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM rust:${rust_ver}-slim-buster

ARG android_ndk_ver=r22b
ARG cargo_ndk_ver=2.2.0
ARG build_rev=0
ARG build_rev=1

LABEL org.opencontainers.image.source="\
https://github.com/instrumentisto/cargo-ndk-docker-image"
Expand All @@ -22,6 +22,7 @@ RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends --no-install-suggests \
ca-certificates \
make \
&& update-ca-certificates \
\
# Install installation tools
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cargo-ndk Docker image

## Supported tags and respective `Dockerfile` links

- [`2.2.0-ndkr22b-rust1.51-r0`, `2.2.0-ndkr22b-rust1.51`, `2.2.0-ndkr22b`, `2.2-ndkr22b`, `2-ndkr22b`, `2.2.0`, `2.2`, `2`, `latest`][101]
- [`2.2.0-ndkr22b-rust1.51-r1`, `2.2.0-ndkr22b-rust1.51`, `2.2.0-ndkr22b`, `2.2-ndkr22b`, `2-ndkr22b`, `2.2.0`, `2.2`, `2`, `latest`][101]



Expand Down
7 changes: 7 additions & 0 deletions tests/main.bats
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,10 @@
'rustup target list --installed | grep -wq x86_64-linux-android'
[ "$status" -eq 0 ]
}


@test "make is installed" {
run docker run --rm --entrypoint sh $IMAGE -c \
'which make'
[ "$status" -eq 0 ]
}

1 comment on commit f3c44c3

@tyranron
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack @alexlapa

Please sign in to comment.