Skip to content

Commit

Permalink
fix(logging): update docker compose to latest rust version
Browse files Browse the repository at this point in the history
  • Loading branch information
ashokkjag committed Jun 6, 2023
1 parent 01a3113 commit fc10411
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 81 deletions.
80 changes: 10 additions & 70 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/router_env/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ strum = { version = "0.24.1", features = ["derive"] }
time = { version = "0.3.20", default-features = false, features = ["formatting"] }
tokio = { version = "1.27.0" }
tracing = { version = "=0.1.36" }
tracing-actix-web = { version = "0.7.4", features = ["opentelemetry_0_18"], optional = true }
tracing-actix-web = { version = "0.7.4", features = ["opentelemetry_0_19"], optional = true }
tracing-appender = { version = "0.2.2" }
tracing-attributes = "=0.1.22"
tracing-opentelemetry = { version = "0.19.0" }
Expand Down
16 changes: 6 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ services:
- POSTGRES_DB=hyperswitch_db

migration_runner:
image: rust:1.69
image: rust:1.70
command: "bash -c 'cargo install diesel_cli --no-default-features --features \"postgres\" && diesel migration --database-url postgres://db_user:db_pass@pg:5432/hyperswitch_db run'"
working_dir: /app
networks:
Expand All @@ -93,7 +93,7 @@ services:
- ./:/app

hyperswitch-server-init:
image: rust:1.69
image: rust:1.70
command: cargo build --bin router
working_dir: /app
networks:
Expand All @@ -104,9 +104,8 @@ services:
- cargo_build_cache:/cargo_build_cache
environment:
- CARGO_TARGET_DIR=/cargo_build_cache
- CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
hyperswitch-server:
image: rust:1.69
image: rust:1.70
command: /cargo_build_cache/debug/router -f ./config/docker_compose.toml
working_dir: /app
ports:
Expand All @@ -133,7 +132,7 @@ services:
condition: service_completed_successfully

hyperswitch-producer:
image: rust:1.69
image: rust:1.70
command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
working_dir: /app
networks:
Expand All @@ -147,15 +146,14 @@ services:
environment:
- CARGO_TARGET_DIR=/cargo_build_cache
- SCHEDULER_FLOW=producer
- CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
depends_on:
hyperswitch-consumer:
condition: service_healthy
labels:
logs: "promtail"

hyperswitch-consumer:
image: rust:1.69
image: rust:1.70
command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
working_dir: /app
networks:
Expand All @@ -169,7 +167,6 @@ services:
environment:
- CARGO_TARGET_DIR=/cargo_build_cache
- SCHEDULER_FLOW=consumer
- CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
depends_on:
hyperswitch-server:
condition: service_started
Expand Down Expand Up @@ -273,7 +270,7 @@ services:
- "4317" # otlp grpc
restart: unless-stopped
hyperswitch-drainer:
image: rust:1.69
image: rust:1.70
command: cargo run --bin drainer -- -f ./config/docker_compose.toml
working_dir: /app
deploy:
Expand All @@ -288,7 +285,6 @@ services:
- cargo_build_cache:/cargo_build_cache
environment:
- CARGO_TARGET_DIR=/cargo_build_cache
- CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
restart: unless-stopped
depends_on:
hyperswitch-server:
Expand Down

0 comments on commit fc10411

Please sign in to comment.