Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion docker-compose.databases.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: databases

services:
db-postgres:
container_name: db-postgres
Expand Down Expand Up @@ -95,7 +97,7 @@ services:
image: redis:latest
container_name: db-redis
ports:
- "6379:6379"
- "6378:6379"
volumes:
- redis-data:/data
command: [ "redis-server", "--appendonly", "yes" ]
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ services:
#- ./databases.toml:/config/config.toml
#- /var/run/docker.sock:/var/run/docker.sock
#- cargo-target:/app/target
#- agent-rust_sqlite-data:/sqlite-data/workspace/data
#- ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data
- databases_sqlite-data:/sqlite-data/workspace/data
- ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data
environment:
APP_ENV: development
LOG: debug
TZ: "Europe/Paris"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOWRjZjYzNzQtZTc5ZC00MzU5LTkwMTYtNjA0OTQ2NDNhNjEwIiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNTMwMjNkYjQtN2EzYS00ZTM0LTk0MWEtNjU2ZTNlNzE2NzlkIiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ=="
#POOLING: 1
DATABASES_CONFIG_FILE: "config.toml"
#DATABASES_CONFIG_FILE: "config.toml"
extra_hosts:
- "localhost:host-gateway"
networks:
Expand All @@ -31,8 +31,8 @@ volumes:
cargo-registry:
cargo-git:
#cargo-target:
# agent-rust_sqlite-data:
# external: true
databases_sqlite-data:
external: true



Expand Down
12 changes: 8 additions & 4 deletions docker/entrypoints/app-dev-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@ check_network() {
fi
}

#check_docker
check_docker
check_network

echo "Starting docker-compose..."
echo "Stopping old database containers..."
docker compose -f ./docker-compose.databases.yml down

echo "Starting database containers..."
docker compose -f ./docker-compose.databases.yml up -d
docker compose -f ./docker-compose.yml up
echo "Docker-compose started successfully."

echo "Starting main services..."
docker compose -f ./docker-compose.yml up
Loading