From 0920005a549cbe6496268878bc72f9beea9c3527 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Sun, 23 Feb 2020 16:13:29 +0000 Subject: [PATCH] fix bug --- Dockerfile | 5 ++--- test-compose/db/Dockerfile | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index db91f3e..84b0e06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM centos:centos8 -RUN dnf install -y @freeradius freeradius-utils freeradius-mysql +RUN dnf install -y @freeradius freeradius-utils freeradius-mysql net-tools RUN ln -s /etc/raddb/mods-available/sql /etc/raddb/mods-enabled/ && chgrp -h radiusd /etc/raddb/mods-enabled/sql @@ -35,7 +35,6 @@ RUN chmod 755 /wait-for-it.sh EXPOSE 1812/udp 1813/udp #healthcheck command so that the container's state is known -HEALTHCHECK --interval=2m --timeout=30s \ - CMD netstat -an | grep udp | grep 1812 > /dev/null; if [ 0 != $? ]; then exit 1; fi; +HEALTHCHECK CMD netstat -an | grep udp | grep 1812 > /dev/null; if [ 0 != $? ]; then exit 1; fi; CMD ["/usr/sbin/radiusd","-fl","stdout"] diff --git a/test-compose/db/Dockerfile b/test-compose/db/Dockerfile index 0c9fc8e..af99003 100644 --- a/test-compose/db/Dockerfile +++ b/test-compose/db/Dockerfile @@ -37,7 +37,6 @@ RUN mysql_install_db \ && echo "mysql -e 'CREATE USER \"${DB_USER}\"@\"%\" IDENTIFIED BY \"${DB_USER_PWD}\";'" >> /tmp/config \ && echo "mysql -e 'GRANT ALL ON ${DB_NAME}.* TO \"${DB_USER}\"@\"%\";'" >> /tmp/config \ && echo "mysql -e 'FLUSH PRIVILEGES;'" >> /tmp/config \ - && cat /tmp/config \ && bash /tmp/config \ && rm -f /tmp/config