Skip to content

Commit a616d1f

Browse files
committed
feat(docker-gradle): localstack debug
* allow overriding base compose file * wire debug-aws with localstack
1 parent 7005430 commit a616d1f

File tree

5 files changed

+46
-9
lines changed

5 files changed

+46
-9
lines changed

docker/build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,10 @@ quickstart_configs.each { taskName, config ->
371371

372372
// Only restart containers that had their modules rebuilt
373373
if (containersToRestart) {
374-
def cmd = ["docker compose -p datahub --profile ${config.profile}"] + ['-f', compose_base] + ['restart'] + containersToRestart
374+
def composeFiles = dockerCompose."${taskName}".useComposeFiles.get()
375+
def composeFileArgs = composeFiles.collectMany { ['-f', it] }
376+
377+
def cmd = ["docker compose -p ${project_name} --profile ${config.profile}"] + composeFileArgs + ['restart'] + containersToRestart
375378
println(cmd.join(" "))
376379
commandLine 'bash', '-c', cmd.join(" ")
377380
} else {
@@ -392,7 +395,10 @@ quickstart_configs.each { taskName, config ->
392395
containersToRestart << "${containerName}-${config.profile}"
393396
}
394397
}
395-
def cmd = ["docker compose -p datahub --profile ${config.profile}"] + ['-f', compose_base] + ['up', '-d', '--no-deps'] + containersToRestart
398+
def composeFiles = dockerCompose."${taskName}".useComposeFiles.get()
399+
def composeFileArgs = composeFiles.collectMany { ['-f', it] }
400+
401+
def cmd = ["docker compose -p ${project_name} --profile ${config.profile}"] + composeFileArgs + ['up', '-d', '--no-deps'] + containersToRestart
396402
println(cmd.join(" "))
397403
commandLine 'bash', '-c', cmd.join(" ")
398404
}

docker/profiles/docker-compose.frontend.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ services:
6666
depends_on:
6767
system-update-debug:
6868
condition: service_completed_successfully
69+
frontend-debug-aws:
70+
<<: *datahub-frontend-service-dev
71+
profiles:
72+
- debug-aws
73+
depends_on:
74+
system-update-debug-aws:
75+
condition: service_completed_successfully
6976
frontend-debug-min:
7077
<<: *datahub-frontend-service-dev
7178
profiles:

docker/profiles/docker-compose.gms.yml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ x-datahub-dev-telemetry-env: &datahub-dev-telemetry-env
4949
DATAHUB_SERVER_TYPE: ${DATAHUB_SERVER_TYPE:-dev}
5050
DATAHUB_TELEMETRY_ENABLED: ${DATAHUB_TELEMETRY_ENABLED:-true}
5151

52+
x-localstack-env: &localstack-env
53+
AWS_ENDPOINT_URL: ${DATAHUB_AWS_ENDPOINT_URL:-http://localstack:4566}
54+
AWS_ACCESS_KEY_ID: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
55+
AWS_SECRET_ACCESS_KEY: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
56+
AWS_REGION: ${DATAHUB_AWS_REGION:-us-east-1}
57+
DATAHUB_EXECUTOR_ROLE_ARN: ${DATAHUB_EXECUTOR_ROLE_ARN:-arn:aws:iam::000000000000:role/test-role}
58+
5259
#################################
5360
# System Update
5461
#################################
@@ -274,6 +281,18 @@ services:
274281
condition: service_completed_successfully
275282
kafka-setup-dev:
276283
condition: service_completed_successfully
284+
system-update-debug-aws: &system-update-debug
285+
<<: *datahub-system-update-service-dev
286+
profiles:
287+
- debug-backend-aws
288+
- debug-aws
289+
depends_on:
290+
mysql-setup-dev:
291+
condition: service_completed_successfully
292+
opensearch-setup-dev:
293+
condition: service_completed_successfully
294+
kafka-setup-dev:
295+
condition: service_completed_successfully
277296
system-update-debug-consumers: # for consistent naming based on profile
278297
<<: *system-update-debug
279298
profiles:
@@ -378,16 +397,13 @@ services:
378397
condition: service_completed_successfully
379398
datahub-gms-debug-aws:
380399
<<: *datahub-gms-service-dev
400+
environment:
401+
<<: [*localstack-env, *datahub-gms-dev-env]
381402
profiles:
382403
- debug-backend-aws
383-
environment:
384-
<<: *datahub-gms-dev-env
385-
AWS_ENDPOINT_URL: ${DATAHUB_AWS_ENDPOINT_URL:-http://localstack:4566}
386-
AWS_ACCESS_KEY_ID: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
387-
AWS_SECRET_ACCESS_KEY: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
388-
AWS_REGION: ${DATAHUB_AWS_REGION:-us-east-1}
404+
- debug-aws
389405
depends_on:
390-
system-update-debug:
406+
system-update-debug-aws:
391407
condition: service_completed_successfully
392408
datahub-gms-debug-min:
393409
<<: *datahub-gms-service-dev

docker/profiles/docker-compose.prerequisites.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ x-mysql-profiles-dev: &mysql-profiles-dev
2121
- debug-neo4j
2222
- debug-elasticsearch
2323
- debug-backend-aws
24+
- debug-aws
2425
x-mysql-profiles: &mysql-profiles
2526
- quickstart
2627
- quickstart-backend
@@ -36,6 +37,7 @@ x-mysql-profiles: &mysql-profiles
3637
- debug-neo4j
3738
- debug-elasticsearch
3839
- debug-backend-aws
40+
- debug-aws
3941

4042
x-postgres-profiles-quickstart: &postgres-profiles-quickstart
4143
- quickstart-postgres
@@ -78,6 +80,7 @@ x-opensearch-profiles-dev: &opensearch-profiles-dev
7880
- debug-consumers
7981
- debug-neo4j
8082
- debug-backend-aws
83+
- debug-aws
8184
x-opensearch-profiles: &opensearch-profiles
8285
- quickstart
8386
- quickstart-backend
@@ -97,10 +100,12 @@ x-opensearch-profiles: &opensearch-profiles
97100
- debug-consumers
98101
- debug-neo4j
99102
- debug-backend-aws
103+
- debug-aws
100104

101105
# AWS Infra profiles
102106
x-profiles-aws: &aws-profiles
103107
- debug-backend-aws
108+
- debug-aws
104109

105110
# Debug vs Quickstart Profiles
106111
x-profiles-quickstart: &profiles-quickstart
@@ -124,6 +129,7 @@ x-profiles-dev: &profiles-dev
124129
- debug-neo4j
125130
- debug-elasticsearch
126131
- debug-backend-aws
132+
- debug-aws
127133

128134
services:
129135
mysql:

docker/quickstart/docker-compose.quickstart-profile.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ services:
243243
- debug-neo4j
244244
- debug-elasticsearch
245245
- debug-backend-aws
246+
- debug-aws
246247
command:
247248
- --character-set-server=utf8mb4
248249
- --collation-server=utf8mb4_bin
@@ -319,6 +320,7 @@ services:
319320
- debug-consumers
320321
- debug-neo4j
321322
- debug-backend-aws
323+
- debug-aws
322324
deploy:
323325
resources:
324326
limits:

0 commit comments

Comments
 (0)