test changing radius docker (#878)
* test changing radius docker * more container changes * more * fix * fix again * -d flag test * raddb -> freeradius
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
|
||||
Reference in New Issue
Block a user