Skip to content

Commit

Permalink
Merge #945
Browse files Browse the repository at this point in the history
945: Fix pre-build Docker image names with Podman. r=Emilgardis a=Alexhuszagh

Fixes #944.

Co-authored-by: Alex Huszagh <[email protected]>
  • Loading branch information
bors[bot] and Alexhuszagh authored Jul 14, 2022
2 parents 6cd09b3 + 58fb72f commit 86e3f62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changes/945.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "fixed",
"description": "fix pre-build hook image naming with podman",
"issues": [944]
}
2 changes: 1 addition & 1 deletion src/docker/custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{errors::*, file, CommandExt, ToUtf8};

use super::{image_name, parse_docker_opts, path_hash};

pub const CROSS_CUSTOM_DOCKERFILE_IMAGE_PREFIX: &str = "cross-custom-";
pub const CROSS_CUSTOM_DOCKERFILE_IMAGE_PREFIX: &str = "localhost/cross-rs/cross-custom-";

#[derive(Debug, PartialEq, Eq)]
pub enum Dockerfile<'a> {
Expand Down

0 comments on commit 86e3f62

Please sign in to comment.