From aeb9c46247df39c00e59579860b42da39b856cdc Mon Sep 17 00:00:00 2001
From: Aravinth Manivannan <realaravinth@batsense.net>
Date: Fri, 29 Sep 2023 19:35:48 +0530
Subject: [PATCH] feat: rename docker cmds in Makefile

---
 Cargo.lock | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |   3 +-
 Makefile   |   8 ++---
 3 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e964e2..043c429 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,6 +288,54 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
+[[package]]
+name = "anstream"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6cd65a4b849ace0b7f6daeebcc1a1d111282227ca745458c61dbf670e52a597"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0238ca56c96dfa37bdf7c373c8886dd591322500aceeeccdb2216fe06dc2f796"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "async-compression"
 version = "0.4.2"
@@ -468,6 +516,52 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "clap"
+version = "4.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "config"
 version = "0.13.3"
@@ -870,6 +964,7 @@ dependencies = [
  "actix-web-httpauth",
  "actix-web-prom",
  "base64 0.13.1",
+ "clap",
  "config",
  "derive_builder",
  "derive_more",
@@ -3075,6 +3170,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "uuid"
 version = "1.4.1"
diff --git a/Cargo.toml b/Cargo.toml
index 95f309c..c43a8a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,8 @@ uuid = { version = "1.4.1", features = ["v4", "serde"] }
 rand = "0.8.5"
 semver = { version = "1.0.18", features = ["serde"] }
 toml = "0.7.6"
-tokio = { version = "1.32.0", features = ["sync"] }
+tokio = { version = "1.32.0", features = ["sync", "time"] }
+clap = { version = "4.4.6", features = ["derive"] }
 
 [build-dependencies]
 serde_json = "1"
diff --git a/Makefile b/Makefile
index d2e6741..9b3cb70 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ endef
 #endef
 
 define test_core
-	cargo test --no-fail-fast
+	cargo test --no-fail-fast -j 1
 endef
 
 
@@ -62,10 +62,10 @@ doc: ## Generate documentation
 	#yarn doc
 	cargo doc --no-deps --workspace --all-features
 
-docker: ## Build Docker image
-	docker build -t forgeflux/ftest:master -t forgeflux/ftest:latest .
+docker.build: ## Build Docker image
+	docker buildx build -t forgeflux/ftest:latest --load .
 
-docker-publish: docker ## Build and publish Docker image
+docker.publish: docker ## Build and publish Docker image
 	docker push forgeflux/ftest:master 
 	docker push forgeflux/ftest:latest