From 6f793fd8001d064d61654f8490a9aa4f3e38ea76 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 6 Jul 2021 23:43:43 +0200
Subject: [PATCH] streamline the container even more for radius

---
 containers/apps/freeradius/Dockerfile    | 7 +++++--
 containers/apps/freeradius/entrypoint.sh | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/containers/apps/freeradius/Dockerfile b/containers/apps/freeradius/Dockerfile
index 9d7f0e16a8d..8bd9d4ba850 100644
--- a/containers/apps/freeradius/Dockerfile
+++ b/containers/apps/freeradius/Dockerfile
@@ -4,13 +4,16 @@ ARG VERSION
 FROM freeradius/freeradius-server:${VERSION}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+VOLUME /config
 
 # hadolint ignore=DL3008,DL3015,SC2086,SC2155
 RUN \
   mkdir -p /defaults/raddb/ && \
-  cp -Rf /etc/raddb/* /defaults/raddb/
+  cp -Rf /etc/raddb/* /defaults/raddb/ && \
+  rm -Rf /etc/raddb && \
+  ln -s  /config /etc/raddb
+
 
-VOLUME /config
 COPY ./containers/apps/freeradius/entrypoint.sh /entrypoint.sh
 
 LABEL "maintainer"="TrueCharts <info@truecharts.org>"
diff --git a/containers/apps/freeradius/entrypoint.sh b/containers/apps/freeradius/entrypoint.sh
index af89ba40ad0..041a74ece93 100644
--- a/containers/apps/freeradius/entrypoint.sh
+++ b/containers/apps/freeradius/entrypoint.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-rm -Rf /etc/raddb
 if [ -f "/config/clients.conf" ]; then
   echo "Radius config already exists, skipping config copy..."
 else
@@ -10,7 +9,6 @@ else
 fi
 
 chown -R freerad:freerad /config
-ln -s /etc/raddb /config
 
 # this if will check if the first argument is a flag
 # but only works if all arguments require a hyphenated flag