From 2d92ad51c32569ee2969be9ab4761c730479ec01 Mon Sep 17 00:00:00 2001
From: Michael Hohn <hohn@github.com>
Date: Thu, 26 Sep 2024 12:36:31 -0700
Subject: [PATCH] Migrate entries from global Makefile to local

---
 Makefile                            | 16 ----------------
 client/containers/ghmrva/Makefile   | 13 +++++++++++++
 client/containers/ghmrva/README.org |  7 +++----
 3 files changed, 16 insertions(+), 20 deletions(-)
 create mode 100644 client/containers/ghmrva/Makefile

diff --git a/Makefile b/Makefile
index 5c1806d..841cf2d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,22 +31,6 @@ mk.dbt-push: mk.client-qldbtools-container
 	docker push ghcr.io/hohn/client-qldbtools-container:0.1.24
 	touch $@
 
-ghm: mk.client-ghmrva-container
-mk.client-ghmrva-container:
-	cd client/containers/ghmrva && \
-		docker build -t client-ghmrva-container:0.1.24 .
-	touch $@
-
-
-ghm-push: mk.ghm-push
-mk.ghm-push: mk.client-ghmrva-container
-	docker tag client-ghmrva-container:0.1.24 ghcr.io/hohn/client-ghmrva-container:0.1.24 
-	docker push ghcr.io/hohn/client-ghmrva-container:0.1.24 
-	touch $@
-
-ghm-run:
-	docker run --rm -it ghcr.io/hohn/client-ghmrva-container:0.1.24 /bin/bash
-
 server:
 	cd cmd/server && GOOS=linux GOARCH=arm64 go build
 
diff --git a/client/containers/ghmrva/Makefile b/client/containers/ghmrva/Makefile
new file mode 100644
index 0000000..3f03624
--- /dev/null
+++ b/client/containers/ghmrva/Makefile
@@ -0,0 +1,13 @@
+ghm: mk.client-ghmrva-container
+mk.client-ghmrva-container:
+	docker build -t client-ghmrva-container:0.1.24 .
+	touch $@
+
+ghm-push: mk.ghm-push
+mk.ghm-push: mk.client-ghmrva-container
+	docker tag client-ghmrva-container:0.1.24 ghcr.io/hohn/client-ghmrva-container:0.1.24 
+	docker push ghcr.io/hohn/client-ghmrva-container:0.1.24 
+	touch $@
+
+ghm-run:
+	docker run --rm -it ghcr.io/hohn/client-ghmrva-container:0.1.24 /bin/bash
diff --git a/client/containers/ghmrva/README.org b/client/containers/ghmrva/README.org
index 9c883fe..eac84bf 100644
--- a/client/containers/ghmrva/README.org
+++ b/client/containers/ghmrva/README.org
@@ -1,12 +1,11 @@
 * MRVA cli tools container
-  Set up via
+  Set up / run:
   #+BEGIN_SRC sh 
     # Build
-    cd ~/work-gh/mrva/mrvacommander/
+    cd ~/work-gh/mrva/mrvacommander/client/containers/ghmrva/
     make ghm
     # Run
-    docker run --rm gh-mrva
+    docker run -ti  client-ghmrva-container:0.1.24 /bin/bash
     # Push
     make ghm-push
   #+END_SRC
-