From 50e10f758223e456e1304e7b8ae8d2092d89a914 Mon Sep 17 00:00:00 2001
From: Brandon Durepo <no-reply@example.com>
Date: Sat, 21 Dec 2024 07:52:54 -0800
Subject: [PATCH] Add support for the hamlib-base-image and hamlib-runtime
 targets - support the arm64 and amd64 platforms on both a base-image and
 runtime

---
 docker-build/Dockerfile       | 19 +++++-----
 docker-build/README.Docker.md | 71 +++++++++++++++++++++++++++++++++++
 docker-build/README.docker    |  7 ----
 3 files changed, 80 insertions(+), 17 deletions(-)
 create mode 100644 docker-build/README.Docker.md
 delete mode 100644 docker-build/README.docker

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 658a1b7bb..d5c490a73 100644
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -3,25 +3,24 @@ FROM ubuntu:latest AS hamlib-base-image
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
-RUN apt-get update && apt-get install -y build-essential automake libtool python3 && rm -rf /var/lib/apt/lists/* 
+RUN apt-get update \
+	&& apt-get install -y build-essential automake libtool python3.6 \
+	&& rm -rf /var/lib/apt/lists/* 
 
 # Builder Image
+
 FROM hamlib-base-image AS hamlib-builder
 
-COPY . /tmp/build
+COPY . /wip
 
-WORKDIR /tmp/build
+WORKDIR /wip
 
-RUN mkdir -p /tmp/local
-
-RUN ./bootstrap && ./configure --prefix=/tmp/local \
-	&& make clean && make -j && make install
+RUN ./bootstrap && ./configure --prefix=/usr/local \
+	&& make clean && make -j${nproc} && make install
 
 # Runtime Image
 FROM ubuntu:latest AS hamlib-runtime
 
-COPY --from=hamlib-builder /tmp/local/bin /usr/local/bin
-COPY --from=hamlib-builder /tmp/local/lib /usr/local/lib
-COPY --from=hamlib-builder /tmp/local/share /usr/local/share
+COPY --from=hamlib-builder /usr/local /usr/local
 
 ENV LD_LIBRARY_PATH="/usr/local/lib"
diff --git a/docker-build/README.Docker.md b/docker-build/README.Docker.md
new file mode 100644
index 000000000..7e2af0a9d
--- /dev/null
+++ b/docker-build/README.Docker.md
@@ -0,0 +1,71 @@
+
+# Build the hamlib-runtime from the repository root 
+
+```
+docker buildx build \
+	--platform linux/amd64,linux/arm64 \
+	--target hamlib-runtime \
+	-t hamlib-runtime \
+	-f docker-build/Dockerfile \
+	.
+```
+
+# Interactively, develop with the hamlib-base-image
+
+
+## Support the linux/amd64 and linux/arm64 platforms
+```
+docker buildx build \
+	--platform linux/amd64,linux/arm64 \
+	--target hamlib-base-image \
+	-t hamlib-base-image \
+	-f docker-build/Dockerfile \
+	.
+```
+
+## Develop on the linux/amd64 hamlib-base-image
+
+```
+docker run \
+	-it \
+	--rm \
+	--platform linux/amd64 \
+	-v $(pwd):/wip \
+	-w /wip \
+	-u $(id -u):$(id -g) \
+	hamlib-base-image bash
+```
+
+...or the linux/arm64 hamlib-base-image
+
+```
+docker run \
+	-it \
+	--rm \
+	--platform linux/arm64 \
+	-v $(pwd):/wip \
+	-w /wip \
+	-u $(id -u):$(id -g) \
+	hamlib-base-image bash
+```
+
+# Run the linux/amd64 hamlib-runtime
+
+```
+docker run \
+	-it \
+	--rm \
+	--platform linux/amd64 \
+	hamlib-runtime bash
+```
+
+ ...or the linux/arm64 hamlib-runtime
+
+```
+docker run \
+	-it \
+	--rm \
+	--platform linux/arm64 \
+	hamlib-runtime bash
+```
+
diff --git a/docker-build/README.docker b/docker-build/README.docker
deleted file mode 100644
index 44a031344..000000000
--- a/docker-build/README.docker
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Build, execute from the repository root 
-`docker buildx build --platform linux/amd64,linux/arm64 -t hamlib-runtime -f docker-build/Dockerfile .`
-
-# Run the hamlib-runtime
-`docker run -it hamlib-runtime bash`
-