diff --git a/.env.dist b/.env.dist index fdfb144..a5eed6c 100644 --- a/.env.dist +++ b/.env.dist @@ -4,18 +4,14 @@ SERVICE_PORT=5001 SERVICE_CONFIGURATION_DOMAIN=USER # PRISMA -DATABASE_URL="postgresql://user:user@v3-user-db:5432/user?schema=public" +DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=user" # RABBIT MQ RMQ_URI=amqp://v3-broker:5672 RMQ_EXCHANGE=mobicoop -# POSTGRES -POSTGRES_IMAGE=postgres:15.0 - # REDIS -REDIS_IMAGE=redis:7.0-alpine -REDIS_HOST=v3-user-redis +REDIS_HOST=v3-redis REDIS_PASSWORD=redis REDIS_PORT=6379 diff --git a/.env.test b/.env.test index a41a451..ae0e37e 100644 --- a/.env.test +++ b/.env.test @@ -4,7 +4,7 @@ SERVICE_PORT=5001 SERVICE_CONFIGURATION_DOMAIN=USER # PRISMA -DATABASE_URL="postgresql://user:user@localhost:5601/user?schema=public" +DATABASE_URL="postgresql://mobicoop:mobicoop@localhost:5432/mobicoop?schema=user-test" # POSTGRES POSTGRES_IMAGE=postgres:15.0 diff --git a/.gitignore b/.gitignore index 6bdaa4a..223064f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ # custom -.postgresql -.redis_data .env # compiled output diff --git a/ci/.env.ci b/ci/.env.ci index ab9e3b7..32a3c61 100644 --- a/ci/.env.ci +++ b/ci/.env.ci @@ -3,7 +3,7 @@ SERVICE_URL=0.0.0.0 SERVICE_PORT=5001 # PRISMA -DATABASE_URL="postgresql://user:user@v3-user-db-test:5432/user?schema=public" +DATABASE_URL="postgresql://mobicoop:mobicoop@v3-user-db-test:5432/user?schema=public" # RABBIT MQ RMQ_URI=amqp://v3-user-broker:5672 @@ -17,4 +17,5 @@ POSTGRES_IMAGE=postgres:15.0 # REDIS REDIS_IMAGE=redis:7.0-alpine REDIS_HOST=v3-user-redis +REDIS_PASSWORD=redis REDIS_PORT=6379 diff --git a/docker-compose.ci.tools.yml b/docker-compose.ci.tools.yml index 5fd64c8..ecb90e1 100644 --- a/docker-compose.ci.tools.yml +++ b/docker-compose.ci.tools.yml @@ -15,9 +15,9 @@ services: container_name: v3-user-db-test image: ${POSTGRES_IMAGE} environment: - POSTGRES_DB: user - POSTGRES_USER: user - POSTGRES_PASSWORD: user + POSTGRES_DB: mobicoop + POSTGRES_USER: mobicoop + POSTGRES_PASSWORD: mobicoop ports: - 5601:5432 networks: diff --git a/docker-compose.yml b/docker-compose.yml index dc7718a..2436115 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,58 +14,11 @@ services: command: npm run start:dev ports: - ${SERVICE_PORT:-5001}:${SERVICE_PORT:-5001} - depends_on: - - v3-user-db networks: v3-network: aliases: - v3-user-api - v3-user-redis: - container_name: v3-user-redis - image: ${REDIS_IMAGE} - command: redis-server --requirepass ${REDIS_PASSWORD} - ports: - - 6501:6379 - volumes: - - .redis_data:/data - env_file: - - .env - networks: - v3-network: - aliases: - - v3-user-redis - - v3-user-db: - container_name: v3-user-db - image: ${POSTGRES_IMAGE} - environment: - POSTGRES_DB: user - POSTGRES_USER: user - POSTGRES_PASSWORD: user - ports: - - 5501:5432 - volumes: - - .postgresql:/var/lib/postgresql/data:rw - networks: - v3-network: - aliases: - - v3-user-db - - v3-user-db-test: - container_name: v3-user-db-test - image: ${POSTGRES_IMAGE} - environment: - POSTGRES_DB: user - POSTGRES_USER: user - POSTGRES_PASSWORD: user - ports: - - 5601:5432 - networks: - v3-network: - aliases: - - v3-user-db-test - networks: v3-network: name: v3-network