From c1c00a2267b32ff9042199e7dcb64839da8cfd35 Mon Sep 17 00:00:00 2001
From: Evan H // KC2IHX <kc2@indiahotelxray.org>
Date: Sun, 30 Nov 2025 09:39:48 -0800
Subject: [PATCH] moved dockerfile for rigctld, added config stubs

---
 config/udev-serial.rules |  0
 config/udev-sound.rules  |  0
 rigctld/Dockerfile       | 31 +++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 config/udev-serial.rules
 create mode 100644 config/udev-sound.rules

diff --git a/config/udev-serial.rules b/config/udev-serial.rules
new file mode 100644
index 0000000..e69de29
diff --git a/config/udev-sound.rules b/config/udev-sound.rules
new file mode 100644
index 0000000..e69de29
diff --git a/rigctld/Dockerfile b/rigctld/Dockerfile
index e5adbef..05612a1 100644
--- a/rigctld/Dockerfile
+++ b/rigctld/Dockerfile
@@ -1,5 +1,6 @@
 # build rigctld
 
+<<<<<<< HEAD
 FROM debian:latest
 
 RUN mkdir src
@@ -8,13 +9,43 @@ RUN apt update
 RUN apt install -y libconfig-dev autoconf libtool git gcc g++ make cmake libudev-dev libreadline-dev libusb-1.0-0-dev libavahi-common-dev libavahi-client-dev
 
 # build hamlib/rigctld
+=======
+FROM debian:latest AS farpn-base
+ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
+
+# this might be too much, but let's try it
+RUN apt update
+RUN apt update \
+    && apt install -y build-essential libconfig-dev autoconf \
+    libtool git gcc g++ make cmake libudev-dev libusb-1.0-0-dev \
+    libavahi-common-dev libavahi-client-dev
+
+
+# build hamlib/rigctld
+FROM farpn-base AS rigctld-builder
+
+>>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
 RUN <<EOF
 cd src
 git clone https://github.com/Hamlib/Hamlib.git
 cd Hamlib
+<<<<<<< HEAD
 ./bootstrap
 ./configure
 make
 EOF
 
+=======
+mkdir build; cd build
+./bootstrap
+./configure --prefix=/usr/local
+make clean
+make
+make install
+EOF
+
+FROM farpn-base AS rigctld
+COPY --from=rigctld-builder /usr/local /usr/local
+ENV LD_LIBRARY_PATH="/usr/local/lib"
+>>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
 CMD /bin/rigctld