Skip to content

Commit dbbdf1f

Browse files
pashidlospashidlos
authored
Merge pull request #38 from Visual-Regression-Tracker/76-wait-for-postgress
wait for Postgress added
2 parents 5d064c5 + db6da9c commit dbbdf1f

File tree

4 files changed

+206
-18
lines changed

4 files changed

+206
-18
lines changed

‎docker-compose.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
version: "3.7"
22
services:
3-
# api:
4-
# build:
5-
# context: .
6-
# dockerfile: Dockerfile
7-
# environment:
8-
# DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:${POSTGRES_PORT}/${POSTGRES_DB}
9-
# JWT_SECRET: ${JWT_SECRET}
10-
# JWT_LIFE_TIME: ${JWT_LIFE_TIME}
11-
# IMG_UPLOAD_FOLDER: ${IMG_UPLOAD_FOLDER}
12-
# BODY_PARSER_JSON_LIMIT: ${BODY_PARSER_JSON_LIMIT}
13-
# APP_FRONTEND_URL: ${APP_FRONTEND_URL}
14-
# ports:
15-
# - "${APP_PORT}:3000"
16-
# expose:
17-
# - "${APP_PORT}"
18-
# depends_on:
19-
# - postgres
3+
api:
4+
# build:
5+
# context: .
6+
# dockerfile: Dockerfile
7+
# environment:
8+
# DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
9+
# JWT_SECRET: ${JWT_SECRET}
10+
# JWT_LIFE_TIME: ${JWT_LIFE_TIME}
11+
# IMG_UPLOAD_FOLDER: ${IMG_UPLOAD_FOLDER}
12+
# BODY_PARSER_JSON_LIMIT: ${BODY_PARSER_JSON_LIMIT}
13+
# APP_FRONTEND_URL: ${APP_FRONTEND_URL}
14+
# ports:
15+
# - "${APP_PORT}:3000"
16+
# expose:
17+
# - "${APP_PORT}"
18+
# depends_on:
19+
# - postgres
2020
postgres:
2121
image: postgres:12
2222
restart: always
@@ -35,7 +35,7 @@ services:
3535
# context: prisma
3636
# dockerfile: Dockerfile
3737
# environment:
38-
# DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:${POSTGRES_PORT}/${POSTGRES_DB}
38+
# DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
3939
# depends_on:
4040
# - postgres
4141
volumes:

‎prisma/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
FROM node:12-alpine
22

3+
RUN apk add --no-cache bash
4+
35
WORKDIR /app
46

57
COPY . .
68

79
RUN npm ci
810

11+
RUN chmod +x /app/wait-for-it.sh
912
RUN chmod +x /app/entrypoint.sh
1013

1114
ENTRYPOINT ["/app/entrypoint.sh"]

‎prisma/entrypoint.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22
set -e
33

4+
/app/wait-for-it.sh postgres:5432 -- echo Postgress is up!
5+
46
echo Start applying migrations...
57

68
# apply migration

‎prisma/wait-for-it.sh‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
#!/usr/bin/env bash
2+
# Use this script to test if a given TCP host/port are available
3+
# https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh
4+
5+
WAITFORIT_cmdname=${0##*/}
6+
7+
echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
8+
9+
usage()
10+
{
11+
cat << USAGE >&2
12+
Usage:
13+
$WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
14+
-h HOST | --host=HOST Host or IP under test
15+
-p PORT | --port=PORT TCP port under test
16+
Alternatively, you specify the host and port as host:port
17+
-s | --strict Only execute subcommand if the test succeeds
18+
-q | --quiet Don't output any status messages
19+
-t TIMEOUT | --timeout=TIMEOUT
20+
Timeout in seconds, zero for no timeout
21+
-- COMMAND ARGS Execute command with args after the test finishes
22+
USAGE
23+
exit 1
24+
}
25+
26+
wait_for()
27+
{
28+
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
29+
echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
30+
else
31+
echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
32+
fi
33+
WAITFORIT_start_ts=$(date +%s)
34+
while :
35+
do
36+
if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
37+
nc -z $WAITFORIT_HOST $WAITFORIT_PORT
38+
WAITFORIT_result=$?
39+
else
40+
(echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
41+
WAITFORIT_result=$?
42+
fi
43+
if [[ $WAITFORIT_result -eq 0 ]]; then
44+
WAITFORIT_end_ts=$(date +%s)
45+
echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
46+
break
47+
fi
48+
sleep 1
49+
done
50+
return $WAITFORIT_result
51+
}
52+
53+
wait_for_wrapper()
54+
{
55+
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
56+
if [[ $WAITFORIT_QUIET -eq 1 ]]; then
57+
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
58+
else
59+
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
60+
fi
61+
WAITFORIT_PID=$!
62+
trap "kill -INT -$WAITFORIT_PID" INT
63+
wait $WAITFORIT_PID
64+
WAITFORIT_RESULT=$?
65+
if [[ $WAITFORIT_RESULT -ne 0 ]]; then
66+
echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
67+
fi
68+
return $WAITFORIT_RESULT
69+
}
70+
71+
# process arguments
72+
while [[ $# -gt 0 ]]
73+
do
74+
case "$1" in
75+
*:* )
76+
WAITFORIT_hostport=(${1//:/ })
77+
WAITFORIT_HOST=${WAITFORIT_hostport[0]}
78+
WAITFORIT_PORT=${WAITFORIT_hostport[1]}
79+
shift 1
80+
;;
81+
--child)
82+
WAITFORIT_CHILD=1
83+
shift 1
84+
;;
85+
-q | --quiet)
86+
WAITFORIT_QUIET=1
87+
shift 1
88+
;;
89+
-s | --strict)
90+
WAITFORIT_STRICT=1
91+
shift 1
92+
;;
93+
-h)
94+
WAITFORIT_HOST="$2"
95+
if [[ $WAITFORIT_HOST == "" ]]; then break; fi
96+
shift 2
97+
;;
98+
--host=*)
99+
WAITFORIT_HOST="${1#*=}"
100+
shift 1
101+
;;
102+
-p)
103+
WAITFORIT_PORT="$2"
104+
if [[ $WAITFORIT_PORT == "" ]]; then break; fi
105+
shift 2
106+
;;
107+
--port=*)
108+
WAITFORIT_PORT="${1#*=}"
109+
shift 1
110+
;;
111+
-t)
112+
WAITFORIT_TIMEOUT="$2"
113+
if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
114+
shift 2
115+
;;
116+
--timeout=*)
117+
WAITFORIT_TIMEOUT="${1#*=}"
118+
shift 1
119+
;;
120+
--)
121+
shift
122+
WAITFORIT_CLI=("$@")
123+
break
124+
;;
125+
--help)
126+
usage
127+
;;
128+
*)
129+
echoerr "Unknown argument: $1"
130+
usage
131+
;;
132+
esac
133+
done
134+
135+
if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
136+
echoerr "Error: you need to provide a host and port to test."
137+
usage
138+
fi
139+
140+
WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
141+
WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
142+
WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
143+
WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
144+
145+
# Check to see if timeout is from busybox?
146+
WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
147+
WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
148+
149+
WAITFORIT_BUSYTIMEFLAG=""
150+
if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
151+
WAITFORIT_ISBUSY=1
152+
# Check if busybox timeout uses -t flag
153+
# (recent Alpine versions don't support -t anymore)
154+
if timeout &>/dev/stdout | grep -q -e '-t '; then
155+
WAITFORIT_BUSYTIMEFLAG="-t"
156+
fi
157+
else
158+
WAITFORIT_ISBUSY=0
159+
fi
160+
161+
if [[ $WAITFORIT_CHILD -gt 0 ]]; then
162+
wait_for
163+
WAITFORIT_RESULT=$?
164+
exit $WAITFORIT_RESULT
165+
else
166+
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
167+
wait_for_wrapper
168+
WAITFORIT_RESULT=$?
169+
else
170+
wait_for
171+
WAITFORIT_RESULT=$?
172+
fi
173+
fi
174+
175+
if [[ $WAITFORIT_CLI != "" ]]; then
176+
if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
177+
echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
178+
exit $WAITFORIT_RESULT
179+
fi
180+
exec "${WAITFORIT_CLI[@]}"
181+
else
182+
exit $WAITFORIT_RESULT
183+
fi

0 commit comments

Comments
 (0)