Skip to content

Commit

Permalink
Updates after renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob6838 committed Oct 21, 2024
1 parent 556be05 commit 60ebf5a
Show file tree
Hide file tree
Showing 96 changed files with 64 additions and 39 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "services/conflictvisualizer-api/jpo-conflictmonitor"]
path = services/conflictvisualizer-api/jpo-conflictmonitor
[submodule "services/intersection-api/jpo-conflictmonitor"]
path = services/intersection-api/jpo-conflictmonitor
url = https://github.com/usdot-jpo-ode/jpo-conflictmonitor
[submodule "services/conflictvisualizer-api/asn1_codec"]
path = services/conflictvisualizer-api/asn1_codec
[submodule "services/intersection-api/asn1_codec"]
path = services/intersection-api/asn1_codec
url = https://github.com/usdot-jpo-ode/asn1_codec
11 changes: 0 additions & 11 deletions conflictmonitor/README.md

This file was deleted.

34 changes: 26 additions & 8 deletions docker-compose-cm-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,17 @@ services:
kafka:
condition: service_started
volumes:
- ./conflictmonitor/kafka/kafka_init.sh:/kafka_init.sh
- ./resources/kafka/kafka_init.sh:/kafka_init.sh
entrypoint: ['/bin/sh', 'kafka_init.sh']

ode:
# -------- To build the image locally --------
# image: jpo-ode:latest
# build: ./services/intersection-api/jpo-conflictmonitor/jpo-geojsonconverter/jpo-ode
#
# -------- To use a remote image -------------
image: usdotjpoode/jpo-ode:develop
# --------------------------------------------
ports:
- '8080:8080'
- '9090:9090'
Expand Down Expand Up @@ -117,7 +123,13 @@ services:
max-file: '5'

geojsonconverter:
# -------- To build the image locally --------
# image: jpo-geojsonconverter:latest
# build: ./services/intersection-api/jpo-conflictmonitor/jpo-geojsonconverter
#
# -------- To use a remote image -------------
image: usdotjpoode/geojsonconverter:develop
# --------------------------------------------
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
geometry.output.mode: ${GEOMETRY_OUTPUT_MODE}
Expand All @@ -130,7 +142,13 @@ services:
- ode

conflictmonitor:
# -------- To build the image locally --------
# image: jpo-conflictmonitor:latest
# build: ./services/intersection-api/jpo-conflictmonitor
#
# -------- To use a remote image -------------
image: usdotjpoode/jpo-conflictmonitor:develop
# --------------------------------------------
restart: always
ports:
- '8082:8082'
Expand Down Expand Up @@ -253,12 +271,12 @@ services:
- '27017:27017'
volumes:
- mongodb_data_container:/data/db
- ./conflictmonitor/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./conflictmonitor/mongo/keyfile.txt:/data/keyfile-import.txt
- ./conflictmonitor/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./conflictmonitor/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./conflictmonitor/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./conflictmonitor/mongo/dump_2024_08_20:/dump
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/keyfile.txt:/data/keyfile-import.txt
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./resources/mongodumps/dump_2024_08_20:/dump
healthcheck:
test: |
test $$(mongosh --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} --quiet --eval "try { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: '${DB_HOST_IP}' }] }).ok } catch (_) { rs.status().ok }") -eq 1
Expand Down Expand Up @@ -299,7 +317,7 @@ services:
connect:
image: cp-kafka-connect:6.1.9
build:
context: ./conflictmonitor/connect
context: ./services/intersection-api/jpo-conflictmonitor/docker/connect
dockerfile: Dockerfile
container_name: jpo-conflictmonitor-kafka-connect
restart: always
Expand Down
34 changes: 26 additions & 8 deletions docker-compose-full-cm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,17 @@ services:
kafka:
condition: service_started
volumes:
- ./conflictmonitor/kafka/kafka_init.sh:/kafka_init.sh
- ./resources/kafka/kafka_init.sh:/kafka_init.sh
entrypoint: ['/bin/sh', 'kafka_init.sh']

ode:
# -------- To build the image locally --------
# image: jpo-ode:latest
# build: ./services/intersection-api/jpo-conflictmonitor/jpo-geojsonconverter/jpo-ode
#
# -------- To use a remote image -------------
image: usdotjpoode/jpo-ode:develop
# --------------------------------------------
ports:
- '8080:8080'
- '9090:9090'
Expand Down Expand Up @@ -201,7 +207,13 @@ services:
max-file: '5'

geojsonconverter:
# -------- To build the image locally --------
# image: jpo-geojsonconverter:latest
# build: ./services/intersection-api/jpo-conflictmonitor/jpo-geojsonconverter
#
# -------- To use a remote image -------------
image: usdotjpoode/geojsonconverter:develop
# --------------------------------------------
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
geometry.output.mode: ${GEOMETRY_OUTPUT_MODE}
Expand All @@ -214,7 +226,13 @@ services:
- ode

conflictmonitor:
# -------- To build the image locally --------
# image: jpo-conflictmonitor:latest
# build: ./services/intersection-api/jpo-conflictmonitor
#
# -------- To use a remote image -------------
image: usdotjpoode/jpo-conflictmonitor:develop
# --------------------------------------------
restart: always
ports:
- '8082:8082'
Expand Down Expand Up @@ -337,12 +355,12 @@ services:
- '27017:27017'
volumes:
- mongodb_data_container:/data/db
- ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/mongo/keyfile.txt:/data/keyfile-import.txt
- ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./conflictmonitor/mongo/dump_2024_08_20:/dump
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/keyfile.txt:/data/keyfile-import.txt
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./resources/mongodumps/dump_2024_08_20:/dump
healthcheck:
test: |
test $$(mongosh --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} --quiet --eval "try { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: '${DB_HOST_IP}' }] }).ok } catch (_) { rs.status().ok }") -eq 1
Expand Down Expand Up @@ -383,7 +401,7 @@ services:
connect:
image: cp-kafka-connect:6.1.9
build:
context: ./services/conflictvisualizer-api/jpo-conflictmonitor/docker/connect
context: ./services/intersection-api/jpo-conflictmonitor/docker/connect
dockerfile: Dockerfile
container_name: jpo-conflictmonitor-kafka-connect
restart: always
Expand Down
16 changes: 8 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ services:
kafka:
condition: service_started
volumes:
- ./conflictmonitor/kafka/kafka_init.sh:/kafka_init.sh
- ./resources/kafka/kafka_init.sh:/kafka_init.sh
entrypoint: ['/bin/sh', 'kafka_init.sh']

intersection_api:
Expand Down Expand Up @@ -247,13 +247,13 @@ services:
- '27017:27017'
volumes:
- mongodb_data_container:/data/db
- ./conflictmonitor/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./conflictmonitor/mongo/keyfile.txt:/data/keyfile-import.txt
- ./conflictmonitor/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./conflictmonitor/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./conflictmonitor/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./conflictmonitor/mongo/mongorestore.sh:/docker-entrypoint-initdb.d/mongorestore.sh
- ./conflictmonitor/mongo/dump_2024_08_20:/dump
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/keyfile.txt:/data/keyfile-import.txt
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js
- ./services/intersection-api/jpo-conflictmonitor/docker/mongo/mongorestore.sh:/docker-entrypoint-initdb.d/mongorestore.sh
- ./resources/mongodumps/dump_2024_08_20:/dump
healthcheck:
test: |
test $$(mongosh --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} --quiet --eval "try { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: '${DB_HOST_IP}' }] }).ok } catch (_) { rs.status().ok }") -eq 1
Expand Down
File renamed without changes.

0 comments on commit 60ebf5a

Please sign in to comment.