From 78ef1bbef2ba70e0d8915505f759cae5aed75192 Mon Sep 17 00:00:00 2001
From: Simon <simon@adlem.net>
Date: Wed, 10 Feb 2021 11:52:51 +0000
Subject: [PATCH] Docker proxy and noproxy

---
 docker-configs/Dockerfile-noproxy               | 17 +++++++++++++++++
 docker-configs/{Dockerfile => Dockerfile-proxy} |  2 +-
 docker-configs/entrypoint-noproxy               |  4 ++++
 docker-configs/{entrypoint => entrypoint-proxy} |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 docker-configs/Dockerfile-noproxy
 rename docker-configs/{Dockerfile => Dockerfile-proxy} (92%)
 create mode 100755 docker-configs/entrypoint-noproxy
 rename docker-configs/{entrypoint => entrypoint-proxy} (51%)

diff --git a/docker-configs/Dockerfile-noproxy b/docker-configs/Dockerfile-noproxy
new file mode 100644
index 0000000..608cf73
--- /dev/null
+++ b/docker-configs/Dockerfile-noproxy
@@ -0,0 +1,17 @@
+FROM python:3.7-alpine
+
+COPY entrypoint-noproxy /entrypoint
+
+RUN adduser -D -u 54000 radio && \
+        apk update && \
+        apk add git gcc musl-dev && \
+        cd /opt && \
+        git clone https://github.com/hacknix/freedmr && \
+        cd /opt/freedmr && \
+        pip install --no-cache-dir -r requirements.txt && \
+        apk del git gcc musl-dev && \
+        chown -R radio: /opt/freedmr
+
+USER radio
+
+ENTRYPOINT [ "/entrypoint" ]
diff --git a/docker-configs/Dockerfile b/docker-configs/Dockerfile-proxy
similarity index 92%
rename from docker-configs/Dockerfile
rename to docker-configs/Dockerfile-proxy
index d12d380..f3f96c7 100644
--- a/docker-configs/Dockerfile
+++ b/docker-configs/Dockerfile-proxy
@@ -1,6 +1,6 @@
 FROM python:3.7-alpine
 
-COPY entrypoint /entrypoint
+COPY entrypoint-proxy /entrypoint
 
 RUN adduser -D -u 54000 radio && \
         apk update && \
diff --git a/docker-configs/entrypoint-noproxy b/docker-configs/entrypoint-noproxy
new file mode 100755
index 0000000..7e208ae
--- /dev/null
+++ b/docker-configs/entrypoint-noproxy
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /opt/freedmr
+python /opt/freedmr/bridge_master.py -c freedmr.cfg -r rules.py
diff --git a/docker-configs/entrypoint b/docker-configs/entrypoint-proxy
similarity index 51%
rename from docker-configs/entrypoint
rename to docker-configs/entrypoint-proxy
index d7438fa..ad3f70a 100755
--- a/docker-configs/entrypoint
+++ b/docker-configs/entrypoint-proxy
@@ -2,4 +2,4 @@
 
 cd /opt/freedmr
 python /opt/freedmr/hotspot_proxy_v2.py &
-python /opt/freedmr/bridge_master.py -c hblink.cfg -r rules.py
+python /opt/freedmr/bridge_master.py -c freedmr.cfg -r rules.py