tag images with git commit, use docker build profile

n0-computer · Nov 15, 2022 · 7521ede · 7521ede
1 parent bad9bb0
commit 7521ede
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,4 +33,11 @@ inherits = 'release'
 lto = true
 panic = 'abort'
 incremental = false
+codegen-units = 8
+
+[profile.docker]
+inherits = 'release'
+lto = true
+panic = 'abort'
+incremental = false
 codegen-units = 8
diff --git a/docker/Dockerfile.iroh-gateway b/docker/Dockerfile.iroh-gateway
@@ -29,7 +29,7 @@ WORKDIR /iroh
 
 COPY ../ .
 
-RUN cargo build --bin iroh-gateway --release
+RUN cargo build --bin iroh-gateway --profile=docker
 
 ################################################################################
 ## Final image
@@ -40,7 +40,7 @@ WORKDIR /iroh
 
 # Copy our build, changing owndership to distroless-provided "nonroot" user,
 # (65532:65532)
-COPY --from=builder --chown=65532:65532 /iroh/target/release/iroh-gateway ./
+COPY --from=builder --chown=65532:65532 /iroh/target/docker/iroh-gateway ./
 
 # Use nonroot (unprivileged) user
 USER nonroot

diff --git a/docker/Dockerfile.iroh-one b/docker/Dockerfile.iroh-one
@@ -35,7 +35,7 @@ WORKDIR /iroh
 
 COPY ../ .
 
-RUN cargo build --bin iroh-one --release
+RUN cargo build --bin iroh-one --profile=docker
 
 ################################################################################
 ## Final image
@@ -46,12 +46,12 @@ WORKDIR /iroh
 
 # Copy our build, changing owndership to distroless-provided "nonroot" user,
 # (65532:65532)
-COPY --from=builder --chown=65532:65532 /iroh/target/release/iroh-one ./
+COPY --from=builder --chown=65532:65532 /iroh/target/docker/iroh-one ./
 
 # Use nonroot (unprivileged) user
 USER nonroot
 
-# expose gateway port
-EXPOSE 9050
+# expose gateway, p2p & all default RPC ports
+EXPOSE 4400 4401 4402 4403 4444 9050
 
 CMD ["/iroh/iroh-one"]
diff --git a/docker/Dockerfile.iroh-p2p b/docker/Dockerfile.iroh-p2p
@@ -29,7 +29,7 @@ WORKDIR /iroh
 
 COPY ../ .
 
-RUN cargo build --bin iroh-p2p --release
+RUN cargo build --bin iroh-p2p --profile=docker
 
 ################################################################################
 ## Final image
@@ -40,12 +40,12 @@ WORKDIR /iroh
 
 # Copy our build, changing owndership to distroless-provided "nonroot" user,
 # (65532:65532)
-COPY --from=builder --chown=65532:65532 /iroh/target/release/iroh-p2p ./
+COPY --from=builder --chown=65532:65532 /iroh/target/docker/iroh-p2p ./
 
 # Use nonroot (unprivileged) user
 USER nonroot
 
 # expose the default RPC port
-EXPOSE 4401
+EXPOSE 4401 4444
 
 CMD ["/iroh/iroh-p2p"]
diff --git a/docker/Dockerfile.iroh-store b/docker/Dockerfile.iroh-store
@@ -34,7 +34,7 @@ WORKDIR /iroh
 
 COPY ../ .
 
-RUN cargo build --bin iroh-store --release
+RUN cargo build --bin iroh-store --profile=docker
 
 ################################################################################
 ## Final image
@@ -45,7 +45,7 @@ WORKDIR /iroh
 
 # Copy our build, changing owndership to distroless-provided "nonroot" user,
 # (65532:65532)
-COPY --from=builder --chown=65532:65532 /iroh/target/release/iroh-store ./
+COPY --from=builder --chown=65532:65532 /iroh/target/docker/iroh-store ./
 
 # Use nonroot (unprivileged) user
 USER nonroot

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -4,6 +4,7 @@ use std::{
     env, fs, io,
     path::{Path, PathBuf},
     process::Command,
+    str,
 };
 
 #[derive(Debug, Parser)]
@@ -144,13 +145,18 @@ fn build_docker(all: bool, build_images: Vec<String>) -> Result<()> {
         images = vec![String::from("iroh-one"), String::from("iroh-p2p")];
     }
 
+    let commit = current_git_commit()?;
+
     for image in images {
+        println!("building {}:{}", image, commit);
         let status = Command::new("docker")
             .current_dir(project_root())
             .args([
                 "build",
                 "-t",
-                format!("{}:distroless", image).as_str(),
+                format!("{}:{}", image, commit).as_str(),
+                "-t",
+                format!("{}:latest", image).as_str(),
                 "-f",
                 format!("docker/Dockerfile.{}", image).as_str(),
                 // "--progress=plain",
@@ -165,3 +171,12 @@ fn build_docker(all: bool, build_images: Vec<String>) -> Result<()> {
 
     Ok(())
 }
+
+fn current_git_commit() -> Result<String> {
+    let output = Command::new("git")
+        .current_dir(project_root())
+        .args(["log", "-1", "--pretty=%h"])
+        .output()?;
+    let commitish = str::from_utf8(&output.stdout)?.trim_end();
+    Ok(String::from(commitish))
+}