Skip to content

Commit 01c4600

Browse files
committed
ignoring monitoring and mongo directories, patch to fix merge issue in kafka compose file
1 parent d70b098 commit 01c4600

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.azure/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ The pipeline automatically triggers when:
3535
- `docs` directories
3636
- Markdown (`.md`) files
3737
- `.github` directories
38+
- `monitoring` directories
39+
- `mongo` directories
3840

3941
2. **Publish Artifact**
4042
- Creates an artifact named 'jpo-utils-services'

.azure/azure-pipelines.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ steps:
2323
!**/docs/**
2424
!**/*.md
2525
!**/.github
26+
!**/monitoring/**
27+
!**/mongo/**
2628
TargetFolder: '$(Build.ArtifactStagingDirectory)'
2729

2830
# Publish the artifacts directory for consumption in publish pipeline

docker-compose-kafka.yml

-7
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ services:
7676
KAFKA_TOPIC_MIN_INSYNC_REPLICAS: ${KAFKA_TOPIC_MIN_INSYNC_REPLICAS:-1}
7777
KAFKA_TOPIC_RETENTION_MS: ${KAFKA_TOPIC_RETENTION_MS:-300000}
7878
KAFKA_TOPIC_DELETE_RETENTION_MS: ${KAFKA_TOPIC_DELETE_RETENTION_MS:-3600000}
79-
80-
KAFKA_TOPIC_CREATE_ODE: ${KAFKA_TOPIC_CREATE_ODE:-true}
81-
KAFKA_TOPIC_CREATE_GEOJSONCONVERTER: ${KAFKA_TOPIC_CREATE_GEOJSONCONVERTER:-true}
82-
KAFKA_TOPIC_CREATE_CONFLICTMONITOR: ${KAFKA_TOPIC_CREATE_CONFLICTMONITOR:-true}
83-
KAFKA_TOPIC_CREATE_DEDUPLICATOR: ${KAFKA_TOPIC_CREATE_DEDUPLICATOR:-false}
84-
KAFKA_TOPIC_CREATE_MECDEPOSIT: ${KAFKA_TOPIC_CREATE_MECDEPOSIT:-false}
85-
KAFKA_TOPIC_CREATE_OTHER: ${KAFKA_TOPIC_CREATE_OTHER:-false}
8679

8780
KAFKA_SECURITY_PROTOCOL: ${KAFKA_SECURITY_PROTOCOL:-PLAINTEXT}
8881
KAFKA_SASL_MECHANISM: ${KAFKA_SASL_MECHANISM}

0 commit comments

Comments
 (0)