Skip to content

Commit

Permalink
chore: update default docker images tags + digests (#191)
Browse files Browse the repository at this point in the history
- **doc: add mention about `git` dependency**
- **chore: fix typos**
- **chore: update default image tags + digests**

---------

Co-authored-by: dj8yf0μl <noreply@nowhere.org>
  • Loading branch information
dj8yfo and dj8yf0μl committed Jul 30, 2024
1 parent e3c8adb commit 7a294ae
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 33 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ cargo near
Starts interactive mode that will allow to explore all the available commands.

---
Additionally depends on [Git](https://git-scm.com/) binary being installed, besides [cargo](https://github.com/rust-lang/cargo).

```console
cargo near new
Expand Down
2 changes: 1 addition & 1 deletion cargo-near/src/commands/build_command/docker/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl std::fmt::Display for ReproducibleBuild {
writeln!(
f,
" {}: {}",
"clonable remote of git repository:",
"clonable remote of git repository",
self.repository
.clone()
.map(|url| format!("{}", url))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ crate-type = ["cdylib", "rlib"]
# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
[package.metadata.near.reproducible_build]
# docker image, descriptor of build environment
image = "dj8yfo/sourcescan:0.x.x-dev-git-pull-179-ccache-cut-single" # ERROR: replace with tag in `sourcescan/cargo-near`
image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0"
# tag after colon above serves only descriptive purpose; image is identified by digest
image_digest = "sha256:b46ea2c26ef5762c0675aa3563bd38aa045366c27a9918867a2455c83c8b046a"
image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363"
# build command inside of docker container
# if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
# the command may be any combination of flags of `cargo-near`,
Expand Down
2 changes: 1 addition & 1 deletion cargo-near/src/util/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl std::fmt::Display for VersionMismatch {
)
}
Self::None => write!(f, "no `cargo-near` version mismatch in nested builds detected",),
Self::UnknownFromDocker => write!(f, "it's unknown if `cargo-near` version mismatch has occured in docker build environment",),
Self::UnknownFromDocker => write!(f, "it's unknown if `cargo-near` version mismatch has occurred in docker build environment",),
}
}
}
Expand Down
56 changes: 30 additions & 26 deletions integration-tests/docker-build-template/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions integration-tests/docker-build-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ crate-type = ["cdylib", "rlib"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
near-sdk = { version = "5.1.0", git= "https://github.com/near/near-sdk-rs.git", rev = "23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528"}
near-sdk = { version = "5.2.1" }

[package.metadata.near.reproducible_build]
image = "dj8yfo/sourcescan:0.x.x-dev-cargo-near-finalization"
image_digest = "sha256:f86a095cb3daed21d0b5f86a4b5d9da0c0e26835f85c42678e1d460c9caa2c12"
image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0"
image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363"
container_build_command = ["cargo", "near", "build"]

[profile.release]
Expand Down

0 comments on commit 7a294ae

Please sign in to comment.