Minor cleanup & Dockerfile

src/api/entity/nodes.rs

@@ -3,16 +3,14 @@ use std::net::TcpStream;
 use ssh2::{OpenFlags, OpenType, Session};
 use std::io::{Read, Write};
 use std::path::Path;
-use std::str::FromStr;
 use std::time::Duration;
 use sea_orm::entity::prelude::*;
 use sea_orm::QueryOrder;
-use serde::{de, Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use tokio::time::sleep;
 use proxmox_api;
 use log::{warn, debug};
 use proxmox_api::types::VmId;
-use serde::de::Error;
 use crate::api::entity::locks;
 use crate::api::entity::locks::{lock, try_lock, LockHandle};
 use crate::api::services::{Services, ServiceError, SshError, ssh_run_trimmed};

src/main.rs

@@ -4,14 +4,10 @@ use dotenv::dotenv;
 use rocket::{Build, Rocket};
 use log::{error, info};
 use std::{env, process};
-use rocket::figment::Figment;
-use rocket::figment::providers::{Env, Format, Toml};
-use rocket_dyn_templates::{ Template};
-use serde::Deserialize;
+use crate::api::util::read_p5x_config;
 
 fn configure_rocket() -> Rocket<Build> {
     rocket::build()
-        .attach(Template::fairing())
         .attach(api::init())
 }
 
@@ -27,6 +23,8 @@ async fn main() {
         process::exit(1);
     }
 
+    read_p5x_config();  // Do this so we early-fail if there are missing env vars
+
     let mode = &args[1];
     if mode == "api-server" {
         let rocket = configure_rocket();