Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM tomcat
MAINTAINER jayan_muralidharan@infosys.com

ADD datarapid-api/target/*.war /usr/local/tomcat/webapps/
ADD wait-for-it.sh .

CMD ["catalina.sh", "run"]
4 changes: 2 additions & 2 deletions datarapid-api/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ localDirectory=

# Persistance Details
jdbc.driverClassName = com.mysql.jdbc.Driver
jdbc.url = jdbc:mysql://localhost:3306/datagen
jdbc.url = jdbc:mysql://database:3306/datagen
jdbc.username =root
jdbc.password =root
hibernate.dialect = org.hibernate.dialect.MySQLDialect
Expand All @@ -51,4 +51,4 @@ hibernate.format_sql = false

# UI configs
dataGenFileTypes=CSV
constantBuilderDataTypes=Digits,Number,Currency,Regex,Date,Alpha,AlphaWithSpaces,SSN,State,StateShort,Country,SymbolNASDAQ,SymbolNotNASDAQ,SecurityNameNASDAQ,SecurityNameNotNASDAQ,PhoneDomesticUSA,PhoneDomesticUSAWithExt,Zip,Set
constantBuilderDataTypes=Digits,Number,Currency,Regex,Date,Alpha,AlphaWithSpaces,SSN,State,StateShort,Country,SymbolNASDAQ,SymbolNotNASDAQ,SecurityNameNASDAQ,SecurityNameNotNASDAQ,PhoneDomesticUSA,PhoneDomesticUSAWithExt,Zip,Set
9 changes: 8 additions & 1 deletion datarapid-core/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,11 @@
<root level="debug">
<appender-ref ref="FILE" />
</root>
</configuration>
<root level="error">
<appender-ref ref="STDOUT" />
</root>
<root level="info">
<appender-ref ref="FILE" />
</root>

</configuration>
3 changes: 3 additions & 0 deletions datarapid-docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM mysql
ENV MYSQL_ROOT_PASSWORD root
ADD scripts/*.sql /docker-entrypoint-initdb.d/
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ insert into `users` (`user_id`,`user_name`, `user_desc`, `created_by`, `created_

/*Data for the table `user_roles` */

insert into `user_roles` ('user_access_id',`user_name`, `role_name`, `role_desc`, `role_type`, `group_users`, `usage_type`, `start_date`, `end_date`, `record_count_limit`, `usage_limit`, `days_limit`) values('1','admin','ROLE_ADMIN','admin','individual','','UNLIMITED','2018-01-01 00:00:00','2099-12-31 23:59:59','99999999999999999999','99999999999999999999.99','9999999999');
insert into `user_roles` (`user_access_id`,`user_name`, `role_name`, `role_desc`, `role_type`, `group_users`, `usage_type`, `start_date`, `end_date`, `record_count_limit`, `usage_limit`, `days_limit`) values('1','admin','ROLE_ADMIN','admin','individual','','UNLIMITED','2018-01-01 00:00:00','2099-12-31 23:59:59','99999999999999999999','99999999999999999999.99','9999999999');

COMMIT;

Expand Down
18 changes: 18 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '2'
services:
application:
build: .
restart: always
ports:
- "8080:8080"
depends_on:
- "database"
command: ["./wait-for-it.sh", "database:3306","-t","100", "--", "catalina.sh", "run"]

database:
build: ./datarapid-docs
restart: always
environment:
MYSQL_ROOT_PASSWORD: 'root'
ports:
- "3306:3306"
178 changes: 178 additions & 0 deletions wait-for-it.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
#!/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:-100}
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)
if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
WAITFORIT_ISBUSY=1
WAITFORIT_BUSYTIMEFLAG="-t"

else
WAITFORIT_ISBUSY=0
WAITFORIT_BUSYTIMEFLAG=""
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