From 1077bd2ecdba2d375cd3d27509fc2b5fa765b45c Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Sun, 23 Feb 2020 15:54:07 +0000 Subject: [PATCH] cleanup --- Dockerfile | 13 +-- container_files/wait-for-it.sh | 183 ++++++++++++++++++++++++++++++++ test-compose/db/Dockerfile | 8 +- test-compose/docker-compose.yml | 2 +- test-compose/radius/Dockerfile | 3 +- 5 files changed, 193 insertions(+), 16 deletions(-) create mode 100755 container_files/wait-for-it.sh diff --git a/Dockerfile b/Dockerfile index af010e6..db91f3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM centos:centos8 RUN dnf install -y @freeradius freeradius-utils freeradius-mysql -RUN ln -s /etc/raddb/mods-available/sql /etc/raddb/mods-enabled/ -RUN chgrp -h radiusd /etc/raddb/mods-enabled/sql +RUN ln -s /etc/raddb/mods-available/sql /etc/raddb/mods-enabled/ && chgrp -h radiusd /etc/raddb/mods-enabled/sql +#commands to apply local config to radius' sql config #RUN sed -i 's/\"rlm_sql_null\"/\"rlm_sql_mysql\"/' /etc/raddb/mods-available/sql \ #&& sed -i 's/\"sqlite\"/\"mysql\"/' /etc/raddb/mods-available/sql \ #&& sed -i '/server = \"localhost\"/s/^#*//g' /etc/raddb/mods-available/sql \ @@ -17,7 +17,6 @@ RUN chgrp -h radiusd /etc/raddb/mods-enabled/sql #&& sed -i 's/\"SuperStrongPassword\"/\"${DB_PWD}\"/' /etc/raddb/mods-available/sql \ #&& sed -i 's/radius_db = \"radius\"/radius_db = \"${DB_NAME}\"/' /etc/raddb/mods-available/sql -#RUN cat /etc/raddb/mods-available/sql #install httpd and php @@ -27,11 +26,13 @@ RUN chgrp -h radiusd /etc/raddb/mods-enabled/sql #install Daloradius -#COPY container_files/docker-entrypoint.sh / -#RUN chmod 755 /docker-entrypoint.sh + +#script for use in starting radius only when dependent services are available +# example for downstream Dockerfile: CMD ["/wait-for-it.sh","-q","db:3306","--","/usr/sbin/radiusd","-fl","stdout"] +COPY container_files/wait-for-it.sh / +RUN chmod 755 /wait-for-it.sh EXPOSE 1812/udp 1813/udp -#ENTRYPOINT ["/docker-entrypoint.sh"] #healthcheck command so that the container's state is known HEALTHCHECK --interval=2m --timeout=30s \ diff --git a/container_files/wait-for-it.sh b/container_files/wait-for-it.sh new file mode 100755 index 0000000..b931da1 --- /dev/null +++ b/container_files/wait-for-it.sh @@ -0,0 +1,183 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi + diff --git a/test-compose/db/Dockerfile b/test-compose/db/Dockerfile index 54c7575..0c9fc8e 100644 --- a/test-compose/db/Dockerfile +++ b/test-compose/db/Dockerfile @@ -41,14 +41,8 @@ RUN mysql_install_db \ && bash /tmp/config \ && rm -f /tmp/config - -#RUN (mysqld_safe & ) \ -# && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 1; done; \ -# bin/gsh -registry -check -runscript -noprompt - EXPOSE 3306 - -HEALTHCHECK --interval=2m --timeout=30s CMD curl -s localhost:3306 > /dev/nulli || exit 1 +HEALTHCHECK CMD mysqladmin --silent --wait=30 ping || exit 1 CMD mysqld_safe diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index 713bc50..459964b 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -5,7 +5,7 @@ services: radius: build: context: ./radius/ - command: bash -c "while ! curl -s db:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /usr/sbin/radiusd -fxxl stdout" +# command: bash -c "while ! curl -s db:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /usr/sbin/radiusd -fxxl stdout" depends_on: - db expose: diff --git a/test-compose/radius/Dockerfile b/test-compose/radius/Dockerfile index 2fbd392..45ad26d 100644 --- a/test-compose/radius/Dockerfile +++ b/test-compose/radius/Dockerfile @@ -1,6 +1,5 @@ FROM tier/eduroam-freeradius:3.0-20200221 - COPY container_files/rad-sql.cfg /etc/raddb/mods-available/sql -CMD ["/usr/sbin/radiusd","-fxxl","stdout"] +CMD ["/wait-for-it.sh","-q","db:3306","--","/usr/sbin/radiusd","-fxxl","stdout"]