Fix hash version and add version command (#573)

jamsocket · Jan 25, 2024 · 71d9765 · 71d9765
1 parent 2985665
commit 71d9765
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -21,6 +21,7 @@ RUN touch /work/plane/plane-dynamic/src/lib.rs
 RUN cargo build -p plane --release --locked
 
 COPY .cargo .cargo
+COPY .git .git
 COPY plane plane
 RUN cargo build -p plane --release --locked
 

diff --git a/docker/quickstart/Dockerfile b/docker/quickstart/Dockerfile
@@ -24,6 +24,7 @@ RUN touch /work/plane/plane-dynamic/src/lib.rs
 RUN cargo build -p plane --release --locked
 
 COPY .cargo .cargo
+COPY .git .git
 COPY plane plane
 RUN cargo build -p plane --release --locked
 

diff --git a/plane/src/main.rs b/plane/src/main.rs
@@ -3,6 +3,7 @@
 
 use anyhow::{anyhow, Context, Result};
 use clap::{Parser, Subcommand};
+use colored::Colorize;
 use plane::admin::AdminOpts;
 use plane::client::PlaneClient;
 use plane::controller::run_controller;
@@ -13,6 +14,7 @@ use plane::init_tracing::init_tracing;
 use plane::names::{AcmeDnsServerName, ControllerName, DroneName, Name, OrRandom, ProxyName};
 use plane::proxy::{run_proxy, AcmeConfig, ServerPortConfig};
 use plane::types::ClusterName;
+use plane::{PLANE_GIT_HASH, PLANE_VERSION};
 use std::net::IpAddr;
 use std::path::PathBuf;
 use url::Url;
@@ -119,6 +121,7 @@ enum Command {
         db: String,
     },
     Admin(AdminOpts),
+    Version,
 }
 
 async fn run(opts: Opts) -> Result<()> {
@@ -257,6 +260,10 @@ async fn run(opts: Opts) -> Result<()> {
         Command::Admin(admin_opts) => {
             plane::admin::run_admin_command(admin_opts).await;
         }
+        Command::Version => {
+            println!("Client version: {}", PLANE_VERSION.bright_white());
+            println!("Client hash: {}", PLANE_GIT_HASH.bright_white());
+        }
     }
 
     Ok(())