diff --git a/containers/apps/freeradius/Dockerfile b/containers/apps/freeradius/Dockerfile index 98b48293087..a137448c504 100644 --- a/containers/apps/freeradius/Dockerfile +++ b/containers/apps/freeradius/Dockerfile @@ -9,8 +9,7 @@ VOLUME /config # hadolint ignore=DL3008,DL3015,SC2086,SC2155 RUN \ rm /docker-entrypoint.sh && \ - rm -Rf /etc/raddb && \ - ln -s /config /etc/raddb + rm -Rf /etc/raddb COPY ./containers/apps/freeradius/entrypoint.sh /docker-entrypoint.sh diff --git a/containers/apps/freeradius/docker-entrypoint.sh b/containers/apps/freeradius/docker-entrypoint.sh deleted file mode 100755 index 041a74ece93..00000000000 --- a/containers/apps/freeradius/docker-entrypoint.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -e - -if [ -f "/config/clients.conf" ]; then - echo "Radius config already exists, skipping config copy..." -else - echo "Radius config does not exist, copying..." - cp -Rf /defaults/raddb/* /config/ -fi - -chown -R freerad:freerad /config - -# this if will check if the first argument is a flag -# but only works if all arguments require a hyphenated flag -# -v; -SL; -f arg; etc will work, but not arg1 arg2 -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - set -- freeradius "$@" -fi - -# check for the expected command -if [ "$1" = 'freeradius' ]; then - shift - exec freeradius -f "$@" -fi - -# many people are likely to call "radiusd" as well, so allow that -if [ "$1" = 'radiusd' ]; then - shift - exec freeradius -f "$@" -fi - -# else default to run whatever the user wanted like "bash" or "sh" -exec "$@" diff --git a/containers/apps/freeradius/entrypoint.sh b/containers/apps/freeradius/entrypoint.sh index 9c70a235654..a41f263e1a7 100755 --- a/containers/apps/freeradius/entrypoint.sh +++ b/containers/apps/freeradius/entrypoint.sh @@ -10,24 +10,5 @@ fi chown -R freerad:freerad /config -# this if will check if the first argument is a flag -# but only works if all arguments require a hyphenated flag -# -v; -SL; -f arg; etc will work, but not arg1 arg2 -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - set -- freeradius "$@" -fi -# check for the expected command -if [ "$1" = 'freeradius' ]; then - shift - exec freeradius -f "$@" -fi - -# many people are likely to call "radiusd" as well, so allow that -if [ "$1" = 'radiusd' ]; then - shift - exec freeradius -f "$@" -fi - -# else default to run whatever the user wanted like "bash" or "sh" -exec "$@" +exec freeradius -f -d /config "$@"