From 9f66774541404b86ffd3bbea3c68cc3dcf4751a3 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Thu, 18 Feb 2021 16:15:49 -0500
Subject: [PATCH] Updated Dockerfile and build.sh

This patch updates the main Dockerfile to work in multi-architecture
build.  Dockerfile now builds and install aprsd from pypi, not github.
---
 docker/Dockerfile | 6 ++++--
 docker/build.sh   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7570144..626e5b1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,9 @@ ENV GID=${GID:-1000}
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
-#RUN apt update
+RUN apt update
+RUN apt install -y git build-essential
+RUN apt install -y libffi-dev python3-dev libssl-dev
 #RUN apt-get install -y apt-utils
 #RUN apt-get install -y pkg-config
 #RUN apt upgrade -y
@@ -26,7 +28,7 @@ RUN addgroup --gid $GID $APRS_USER
 RUN useradd -m -u $UID -g $APRS_USER $APRS_USER
 
 # Install aprsd
-RUN /usr/local/bin/pip3 install aprsd
+RUN /usr/local/bin/pip3 install aprsd==1.6.0
 
 # Ensure /config is there with a default config file
 USER root
diff --git a/docker/build.sh b/docker/build.sh
index 80f1eba..a71f1e0 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Official docker image build script.
 
 VERSION="1.6.0"
 
@@ -6,6 +7,6 @@ VERSION="1.6.0"
 docker buildx build --push --platform linux/arm/v7,linux/arm/v6,linux/arm64,linux/amd64 \
     -t hemna6969/aprsd:$VERSION \
     -t hemna6969/aprsd:latest \
-    -t 192.168.1.3:5000/hemna6969/aprsd:latest \
-    -t 192.168.1.3:5000/hemna6969/aprsd:$VERSION \
+    -t harbor.hemna.com/hemna6969/aprsd:latest \
+    -t harbor.hemna.com/hemna6969/aprsd:$VERSION \
     -f Dockerfile .