Skip to content

Commit 476c1a2

Browse files
fix: wait for UDR to be running before starting dev portal in make (#483)
* fix: wait for UDR to be running before starting dev portal in make * fix redirects for terraform-docs-common
1 parent 5046189 commit 476c1a2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

content/terraform-docs-common/redirects.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
"permanent": true,
210210
},
211211
{
212-
"source": "/terraform/language/:version(v1\.(?:7|8|9|10|11|12|13)\.x)/settings/backends/configuration",
212+
"source": "/terraform/language/:version(v1\\.(?:7|8|9|10|11|12|13)\\.x)/settings/backends/configuration",
213213
"destination": "/terraform/language/backend",
214214
"permanent": true,
215215
},

docker-compose.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ services:
88
ports:
99
- ${DEV_PORTAL_PORT}:${DEV_PORTAL_PORT}
1010
depends_on:
11-
- unified-docs-api
11+
unified-docs-api:
12+
condition: service_healthy
1213
environment:
1314
- MKTG_CONTENT_DOCS_API=https://content.hashicorp.com
1415
- UNIFIED_DOCS_PORT=${UNIFIED_DOCS_PORT}
@@ -26,3 +27,9 @@ services:
2627
- DEV_PORTAL_URL=http://dev-portal:${DEV_PORTAL_PORT}
2728
volumes:
2829
- ./content:/server/content
30+
healthcheck:
31+
test: ["CMD", "curl", "-f", "http://localhost:${UNIFIED_DOCS_PORT}"]
32+
interval: 60s
33+
timeout: 10s
34+
retries: 3
35+
start_period: 60s

0 commit comments

Comments
 (0)