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

Final Updates for R4 #53

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Final Updates for R4 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28fddc8
feat: update references
amsmith-pro Sep 11, 2024
706d5b0
chore: reviewer comments
amsmith-pro Sep 24, 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
1 change: 1 addition & 0 deletions .cspell.project-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,4 @@ itest
TENV
tenv
chrono
dozzle
36 changes: 19 additions & 17 deletions local-dev/.env-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ DOCKER_PORT_GRPC=50051
STORAGE_PORT_GRPC=50051
LOG_CONFIG=/log4rs.yaml
REST_CONCURRENCY_LIMIT_PER_SERVICE=5
REST_CORS_ALLOWED_ORIGIN=http://localhost:3000
REST_CORS_ALLOWED_ORIGIN=*
REST_REQUEST_LIMIT_PER_SECOND=2
DOZZLE_PORT=9998

# -----------------------------------------------------------
# Rabbitmq Settings
# -----------------------------------------------------------
AMQP__URL=amqp://arrow-rabbitmq:5672
AMQP__URL=amqp://aetheric-rabbitmq:5672
AMQP__POOL__MAX_SIZE=16
AMQP__POOL__TIMEOUTS__WAIT__SECS=2
AMQP__POOL__TIMEOUTS__WAIT__NANOS=0

# -----------------------------------------------------------
# Redis Settings
# -----------------------------------------------------------
REDIS__URL=redis://arrow-redis:6379
REDIS__URL=redis://aetheric-redis:6379
REDIS__POOL__MAX_SIZE=16
REDIS__POOL__TIMEOUTS__WAIT__SECS=2
REDIS__POOL__TIMEOUTS__WAIT__NANOS=0
Expand All @@ -39,16 +40,16 @@ SERVER_HOSTNAME=localhost
# -----------------------------------------------------------
# svc-assets
# -----------------------------------------------------------
ASSETS_IMAGE=ghcr.io/arrow-air/svc-assets
ASSETS_IMAGE=ghcr.io/aetheric-oss/svc-assets
ASSETS_TAG=latest-develop
ASSETS_HOST_PORT_GRPC=50000
ASSETS_HOST_PORT_REST=8000
ASSETS_HOST_PORT_REST=8030
ASSETS_HOST_GRPC=svc-assets

# -----------------------------------------------------------
# svc-atc
# -----------------------------------------------------------
ATC_IMAGE=ghcr.io/arrow-air/svc-atc
ATC_IMAGE=ghcr.io/aetheric-oss/svc-atc
ATC_TAG=latest-develop
ATC_HOST_PORT_GRPC=50001
ATC_HOST_PORT_REST=8001
Expand All @@ -57,7 +58,7 @@ ATC_HOST_GRPC=svc-atc
# -----------------------------------------------------------
# svc-cargo
# -----------------------------------------------------------
CARGO_IMAGE=ghcr.io/arrow-air/svc-cargo
CARGO_IMAGE=ghcr.io/aetheric-oss/svc-cargo
CARGO_TAG=latest-develop
CARGO_HOST_PORT_GRPC=50002
CARGO_HOST_PORT_REST=8002
Expand All @@ -66,7 +67,7 @@ CARGO_HOST_GRPC=svc-cargo
# -----------------------------------------------------------
# svc-compliance
# -----------------------------------------------------------
COMPLIANCE_IMAGE=ghcr.io/arrow-air/svc-compliance
COMPLIANCE_IMAGE=ghcr.io/aetheric-oss/svc-compliance
COMPLIANCE_TAG=latest-develop
COMPLIANCE_HOST_PORT_GRPC=50003
COMPLIANCE_HOST_PORT_REST=8003
Expand All @@ -75,39 +76,39 @@ COMPLIANCE_HOST_GRPC=svc-compliance
# -----------------------------------------------------------
# svc-gis
# -----------------------------------------------------------
GIS_IMAGE=ghcr.io/arrow-air/svc-gis
GIS_IMAGE=ghcr.io/aetheric-oss/svc-gis
GIS_TAG=latest-develop
GIS_HOST_PORT_GRPC=50008
GIS_HOST_GRPC=svc-gis

# -----------------------------------------------------------
# svc-pricing
# -----------------------------------------------------------
PRICING_IMAGE=ghcr.io/arrow-air/svc-pricing
PRICING_IMAGE=ghcr.io/aetheric-oss/svc-pricing
PRICING_TAG=latest-develop
PRICING_HOST_PORT_GRPC=50009
PRICING_HOST_GRPC=svc-pricing

# -----------------------------------------------------------
# svc-scheduler
# -----------------------------------------------------------
SCHEDULER_IMAGE=ghcr.io/arrow-air/svc-scheduler
SCHEDULER_IMAGE=ghcr.io/aetheric-oss/svc-scheduler
SCHEDULER_TAG=latest-develop
SCHEDULER_HOST_PORT_GRPC=50010
SCHEDULER_HOST_GRPC=svc-scheduler

# -----------------------------------------------------------
# svc-storage
# -----------------------------------------------------------
STORAGE_IMAGE=ghcr.io/arrow-air/svc-storage
STORAGE_IMAGE=ghcr.io/aetheric-oss/svc-storage
STORAGE_TAG=latest-develop
STORAGE_HOST_PORT_GRPC=50011
STORAGE_HOST_GRPC=svc-storage

# -----------------------------------------------------------
# svc-telemetry
# -----------------------------------------------------------
TELEMETRY_IMAGE=ghcr.io/arrow-air/svc-telemetry
TELEMETRY_IMAGE=ghcr.io/aetheric-oss/svc-telemetry
TELEMETRY_TAG=latest-develop
TELEMETRY_HOST_PORT_GRPC=50012
TELEMETRY_HOST_PORT_REST=8012
Expand All @@ -116,7 +117,7 @@ TELEMETRY_HOST_GRPC=svc-telemetry
# -----------------------------------------------------------
# svc-discovery
# -----------------------------------------------------------
DISCOVERY_IMAGE=ghcr.io/arrow-air/svc-discovery
DISCOVERY_IMAGE=ghcr.io/aetheric-oss/svc-discovery
DISCOVERY_TAG=latest-develop
DISCOVERY_HOST_PORT_GRPC=50013
DISCOVERY_HOST_PORT_REST=8013
Expand All @@ -125,17 +126,18 @@ DISCOVERY_HOST_GRPC=svc-discovery
# -----------------------------------------------------------
# svc-contact
# -----------------------------------------------------------
CONTACT_IMAGE=ghcr.io/arrow-air/svc-contact
CONTACT_IMAGE=ghcr.io/aetheric-oss/svc-contact
CONTACT_TAG=latest-develop
CONTACT_HOST_PORT_GRPC=50014
CONTACT_HOST_PORT_REST=8014
CONTACT_HOST_GRPC=svc-contact
POSTMARK_TOKEN=REPLACE_ME

# -----------------------------------------------------------
# svc-itest
# -----------------------------------------------------------
ITEST_IMAGE=ghcr.io/arrow-air/svc-itest
ITEST_IMAGE=ghcr.io/aetheric-oss/svc-itest
ITEST_TAG=latest-develop
ITEST_HOST_PORT_GRPC=50014
ITEST_HOST_PORT_GRPC=50099
ITEST_HOST_PORT_REST=8099
ITEST_HOST_GRPC=svc-itest
86 changes: 50 additions & 36 deletions local-dev/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ services:
cockroachdb-init:
condition: service_completed_successfully

arrow-gis-init-ssl:
aetheric-gis-init-ssl:
extends:
file: docker-compose/arrow-gis/svc.yml
file: docker-compose/aetheric-gis/svc.yml
service: init-ssl

arrow-gis-init:
aetheric-gis-init:
extends:
file: docker-compose/arrow-gis/svc.yml
file: docker-compose/aetheric-gis/svc.yml
service: init
depends_on:
arrow-gis-init-ssl:
aetheric-gis-init-ssl:
condition: service_completed_successfully

arrow-gis:
aetheric-gis:
extends:
file: docker-compose/arrow-gis/svc.yml
file: docker-compose/aetheric-gis/svc.yml
service: server
depends_on:
arrow-gis-init:
aetheric-gis-init:
condition: service_completed_successfully

redis:
Expand All @@ -60,9 +60,9 @@ services:

svc-storage:
image: ${STORAGE_IMAGE}:${STORAGE_TAG}
container_name: arrow-svc-storage
container_name: aetheric-svc-storage
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
cockroachdb:
Expand All @@ -74,23 +74,24 @@ services:
read_only: true
command: --rebuild-psql=true --init-psql=true
environment:
- USE_TLS=true
- PG__USER=svc_storage
- PG__DBNAME=arrow
- PG__DBNAME=realm
- PG__HOST=cockroachdb
- PG__PORT=26257
- PG__SSLMODE=require
- PG__SSLMODE=Require
- DB_CA_CERT=/cockroach/ssl/certs/ca.crt
- DB_CLIENT_CERT=/cockroach/ssl/certs/client.svc_storage.crt
- DB_CLIENT_KEY=/cockroach/ssl/certs/client.svc_storage.key.pk8

svc-gis:
image: ${GIS_IMAGE}:${GIS_TAG}
container_name: arrow-svc-gis
container_name: aetheric-svc-gis
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
arrow-gis:
aetheric-gis:
condition: service_healthy
redis:
condition: service_healthy
Expand All @@ -102,7 +103,7 @@ services:
environment:
- PG__USER=svc_gis
- PG__DBNAME=gis
- PG__HOST=arrow-gis
- PG__HOST=aetheric-gis
- PG__PORT=5432
- PG__SSLMODE=require
- DB_CA_CERT=/ssl/certs/root.crt
Expand All @@ -111,9 +112,9 @@ services:

svc-compliance:
image: ${COMPLIANCE_IMAGE}:${COMPLIANCE_TAG}
container_name: arrow-svc-compliance
container_name: aetheric-svc-compliance
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-gis:
Expand All @@ -126,9 +127,9 @@ services:

svc-scheduler:
image: ${SCHEDULER_IMAGE}:${SCHEDULER_TAG}
container_name: arrow-svc-scheduler
container_name: aetheric-svc-scheduler
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-gis:
Expand All @@ -138,16 +139,16 @@ services:

svc-pricing:
image: ${PRICING_IMAGE}:${PRICING_TAG}
container_name: arrow-svc-pricing
container_name: aetheric-svc-pricing
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server

svc-cargo:
image: ${CARGO_IMAGE}:${CARGO_TAG}
container_name: arrow-svc-cargo
container_name: aetheric-svc-cargo
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
ports:
- ${CARGO_HOST_PORT_REST}:8000
Expand All @@ -165,43 +166,47 @@ services:

svc-assets:
image: ${ASSETS_IMAGE}:${ASSETS_TAG}
container_name: arrow-svc-assets
container_name: aetheric-svc-assets
ports:
- ${ASSETS_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-storage:
condition: service_healthy

svc-contact:
image: ${CONTACT_IMAGE}:${CONTACT_TAG}
container_name: arrow-svc-contact
container_name: aetheric-svc-contact
ports:
- ${CONTACT_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-storage:
condition: service_healthy

svc-atc:
image: ${ATC_IMAGE}:${ATC_TAG}
container_name: arrow-svc-atc
container_name: aetheric-svc-atc
ports:
- ${ATC_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-storage:
condition: service_healthy

svc-telemetry:
image: ${TELEMETRY_IMAGE}:${TELEMETRY_TAG}
container_name: arrow-svc-telemetry
container_name: aetheric-svc-telemetry
ports:
- ${TELEMETRY_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-gis:
Expand All @@ -217,11 +222,11 @@ services:

svc-discovery:
image: ${DISCOVERY_IMAGE}:${DISCOVERY_TAG}
container_name: arrow-svc-discovery
container_name: aetheric-svc-discovery
ports:
- ${DISCOVERY_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-gis:
Expand All @@ -231,11 +236,11 @@ services:

svc-itest:
image: ${ITEST_IMAGE}:${ITEST_TAG}
container_name: arrow-svc-itest
container_name: aetheric-svc-itest
ports:
- ${ITEST_HOST_PORT_REST}:8000
extends:
file: docker-compose/arrow-svc.yml
file: docker-compose/aetheric-svc.yml
service: server
depends_on:
svc-telemetry:
Expand All @@ -248,3 +253,12 @@ services:
condition: service_healthy
svc-compliance:
condition: service_healthy

dozzle:
container_name: aetheric-dozzle
image: amir20/dozzle:latest
volumes:
- /var/run/docker.sock:/var/run/docker.sock
ports:
- ${DOZZLE_PORT}:8080
restart: always
0 ...row-gis/scripts/docker-entrypoint-init.sh → ...ric-gis/scripts/docker-entrypoint-init.sh
View file
Open in desktop
File renamed without changes.
0 ...docker-compose/arrow-gis/scripts/init.sql → ...ker-compose/aetheric-gis/scripts/init.sql
View file
Open in desktop
File renamed without changes.
0 ...compose/arrow-gis/scripts/postgis-init.sh → ...pose/aetheric-gis/scripts/postgis-init.sh
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions local-dev/docker-compose/arrow-gis/svc.yml → ...l-dev/docker-compose/aetheric-gis/svc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ volumes:

services:
init-ssl:
container_name: arrow-gis-init-ssl
container_name: aetheric-gis-init-ssl
image: ghcr.io/arrow-air/tools/arrow-gis:1.0
volumes:
- type: volume
Expand All @@ -26,7 +26,7 @@ services:
- GID=1001

init:
container_name: arrow-gis-init
container_name: aetheric-gis-init
image: ghcr.io/arrow-air/tools/arrow-gis:1.0
user: "postgres:1001"
volumes:
Expand All @@ -53,7 +53,7 @@ services:
- SERVER_HOSTNAME

server:
container_name: arrow-gis
container_name: aetheric-gis
image: ghcr.io/arrow-air/tools/arrow-gis:1.0
restart: always
user: "postgres:1001"
Expand Down
Loading
Loading