diff --git a/.gitignore b/.gitignore index 0d81d61..0ced685 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ xcuserdata/ .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* @@ -509,3 +510,4 @@ dist .yarn/install-state.gz .pnp.* +trading_assistant_api/services/shared_data/ \ No newline at end of file diff --git a/trading_assistant_api/services/docker-compose.yml b/trading_assistant_api/services/docker-compose.yml index f1357ea..b148a78 100644 --- a/trading_assistant_api/services/docker-compose.yml +++ b/trading_assistant_api/services/docker-compose.yml @@ -5,18 +5,18 @@ services: image: postgres:18.1-alpine container_name: api_postgres environment: - POSTGRES_USER: app - POSTGRES_PASSWORD: app123 - POSTGRES_DB: appdb + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres123123 + POSTGRES_DB: postgres ports: - "5432:5432" healthcheck: - test: ["CMD-SHELL", "pg_isready -U app -d appdb"] + test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"] interval: 5s timeout: 5s retries: 20 volumes: - - pgdata:/var/lib/postgresql/data + - ./shared_data/db/:/var/lib/postgresql/data - ../services/user/db/schema.sql:/docker-entrypoint-initdb.d/10_user_schema.sql:ro user: @@ -28,9 +28,9 @@ services: environment: PG_HOST: postgres PG_PORT: "5432" - PG_USER: app - PG_PASSWORD: app123 - PG_DBNAME: appdb + PG_USER: postgres + PG_PASSWORD: postgres123123 + PG_DBNAME: postgres PG_SSLMODE: disable MIGRATE_ON_START: "0" PORT: "8080" @@ -43,17 +43,17 @@ services: condition: service_healthy restart: unless-stopped - country: - build: - context: .. - dockerfile: services/country/Dockerfile - image: country-service:latest - container_name: country_service - environment: - PORT: "8081" - ports: - - "8081:8081" - restart: unless-stopped + # country: + # build: + # context: .. + # dockerfile: services/country/Dockerfile + # image: country-service:latest + # container_name: country_service + # environment: + # PORT: "8081" + # ports: + # - "8081:8081" + # restart: unless-stopped volumes: pgdata: