Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: fix kong setup verification - again #38

Merged
merged 3 commits into from
Jan 5, 2024
Merged

ci: fix kong setup verification - again #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2235a7
ci: fix kong setup verification - again
GGabriele Jan 5, 2024
7e5c8ab
take 2
GGabriele Jan 5, 2024
5d8d31e
take 3
GGabriele Jan 5, 2024
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
10 changes: 5 additions & 5 deletions .ci/setup_kong.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ GATEWAY_CONTAINER_NAME=kong

waitContainer() {
for try in {1..100}; do
echo "waiting for $1.."
nc localhost $2 && break;
sleep $3
echo "waiting for $1"
docker exec --user root $2 $3 && break;
sleep 0.2
done
}

Expand All @@ -33,7 +33,7 @@ docker run --rm -d --name $PG_CONTAINER_NAME \
-e "POSTGRES_PASSWORD=$KONG_DB_PASSWORD" \
postgres:9.6

waitContainer "PostgreSQL" 8001 0.2
waitContainer "PostGres" $PG_CONTAINER_NAME pg_isready

# Prepare the Kong database
docker run --rm --network=$NETWORK_NAME \
Expand Down Expand Up @@ -62,4 +62,4 @@ docker run -d --name $GATEWAY_CONTAINER_NAME \
-p 127.0.0.1:8444:8444 \
$KONG_IMAGE

waitContainer "Kong" 8001 0.2
waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"
18 changes: 5 additions & 13 deletions .ci/setup_kong_ee.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,10 @@ GATEWAY_CONTAINER_NAME=kong
# create docker network
docker network create $NETWORK_NAME

waitPostGres() {
waitContainer() {
for try in {1..100}; do
echo "waiting for PostgreSQL"
nc localhost 5432 && break;
sleep 0.2
done
}

waitKong() {
for try in {1..100}; do
echo "waiting for Kong"
docker exec --user root kong kong health && break;
echo "waiting for $1"
docker exec --user root $2 $3 && break;
sleep 0.2
done
}
Expand All @@ -96,7 +88,7 @@ docker run --rm -d --name $PG_CONTAINER_NAME \
-e "POSTGRES_PASSWORD=$KONG_DB_PASSWORD" \
postgres:9.6

waitPostGres
waitContainer "PostGres" $PG_CONTAINER_NAME pg_isready

# Prepare the Kong database
docker run --rm --network=$NETWORK_NAME \
Expand Down Expand Up @@ -134,4 +126,4 @@ docker run -d --name $GATEWAY_CONTAINER_NAME \
-p 8004:8004 \
$KONG_IMAGE

waitKong
waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"
Loading