diff --git a/apps/api/prisma/.env b/apps/api/prisma/.env index 314f4319..0940b68d 100644 --- a/apps/api/prisma/.env +++ b/apps/api/prisma/.env @@ -1,3 +1 @@ -DATABASE_URL=mysql://ctims:ctims@localhost:3306/ctims -PRISMA_FIELD_ENCRYPTION_KEY=k1.aesgcm256.RhSAzMU4Af5OKXUYQosqNLMRK1Nc3PicRp5iWa6I7Ko= SHADOW_DATABASE_URL=mysql://shadow_db_url/ctims-shadow diff --git a/apps/api/src/app/matchminer/matchminer.service.ts b/apps/api/src/app/matchminer/matchminer.service.ts index 863047f1..67544300 100644 --- a/apps/api/src/app/matchminer/matchminer.service.ts +++ b/apps/api/src/app/matchminer/matchminer.service.ts @@ -29,7 +29,6 @@ export class MatchminerService implements OnModuleInit, OnModuleDestroy { onModuleInit(): any { this.eventService = this.moduleRef.get(EventService, { strict: false }); - this.initRabbitMQ(); } onModuleDestroy(): any { diff --git a/apps/api/src/app/message-queue/message-queue.service.ts b/apps/api/src/app/message-queue/message-queue.service.ts index 042480fa..ec2a1c97 100644 --- a/apps/api/src/app/message-queue/message-queue.service.ts +++ b/apps/api/src/app/message-queue/message-queue.service.ts @@ -24,7 +24,6 @@ export class MessageQueueService implements OnModuleInit, OnModuleDestroy { onModuleInit(): any { this.eventService = this.moduleRef.get(EventService, { strict: false }); - this.initRabbitMQ(); } onModuleDestroy(): any { diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 014e3101..97775e41 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -13,7 +13,7 @@ const nextConfig = { swcMinify: false, publicRuntimeConfig: { // Will be available on both server and client - REACT_APP_API_URL: process.env.REACT_APP_API_URL, + REACT_APP_API_URL: "http://localhost:3333", NEXT_PUBLIC_SIGNOUT_REDIRECT_URL: process.env.NEXT_PUBLIC_SIGNOUT_REDIRECT_URL, }, env: { diff --git a/docker-compose.yml b/docker-compose.yml index 3514a748..74216817 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: - /etc/localtime:/etc/localtime:ro restart: on-failure networks: - - my-network + - shared-network backend: container_name: ctims-api @@ -43,7 +43,7 @@ services: - "3333:3333" restart: on-failure networks: - - my-network + - shared-network database: container_name: ctims-db @@ -54,7 +54,7 @@ services: - "3306:3306" restart: on-failure networks: - - my-network + - shared-network # https://github.com/prisma/prisma/releases/tag/2.17.0 database_shadow: @@ -66,8 +66,9 @@ services: - "3307:3306" restart: on-failure networks: - - my-network + - shared-network networks: - my-network: + shared-network: + external: true diff --git a/keycloak/! b/keycloak/! new file mode 100644 index 00000000..1eee246f --- /dev/null +++ b/keycloak/! @@ -0,0 +1,41 @@ +version: '3.9' + +services: + mysql-kc: + image: mysql:8.0.27 + ports: + - 3366:3306 + restart: unless-stopped + environment: + MYSQL_USER: keycloak_user + MYSQL_PASSWORD: keycloak_password + MYSQL_DATABASE: keycloak_db + volumes: + - keycloak-and-mysql-volume:/var/lib/mysql + networks: + - host + + keycloak-w: + image: quay.io/keycloak/keycloak:18.0 + command: start-dev + ports: + - 8080:8080 + restart: unless-stopped + environment: + KEYCLOAK_USER: admin + KEYCLOAK_PASSWORD: admin + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin + KC_HOSTNAME_STRICT_HTTPS: "false" + KC_HTTP_ENABLED: "true" + DB_VENDOR: mysql + DB_ADDR: mysql-kc + DB_PORT: 3306 + DB_USER: keycloak_user + DB_PASSWORD: keycloak_password + DB_DATABASE: keycloak_db + depends_on: + - mysql-kc + +volumes: + keycloak-and-mysql-volume: diff --git a/keycloak/keycloak-compose.yml b/keycloak/keycloak-compose.yml index dee02542..4a83730b 100644 --- a/keycloak/keycloak-compose.yml +++ b/keycloak/keycloak-compose.yml @@ -5,24 +5,31 @@ services: image: mysql:8.0.27 ports: - 3366:3306 + networks: + - shared-network restart: unless-stopped environment: MYSQL_USER: keycloak_user MYSQL_PASSWORD: keycloak_password MYSQL_DATABASE: keycloak_db - MYSQL_ROOT_PASSWORD: root_password volumes: - keycloak-and-mysql-volume:/var/lib/mysql keycloak-w: image: quay.io/keycloak/keycloak:18.0 - command: start + command: start-dev ports: - 8080:8080 + networks: + - shared-network restart: unless-stopped environment: KEYCLOAK_USER: admin KEYCLOAK_PASSWORD: admin + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin + KC_HOSTNAME_STRICT_HTTPS: "false" + KC_HTTP_ENABLED: "true" DB_VENDOR: mysql DB_ADDR: mysql-kc DB_PORT: 3306 @@ -34,3 +41,7 @@ services: volumes: keycloak-and-mysql-volume: + +networks: + shared-network: + external: true diff --git a/keycloak/run-keycloak.sh b/keycloak/run-keycloak.sh index 3f833514..acf9216b 100755 --- a/keycloak/run-keycloak.sh +++ b/keycloak/run-keycloak.sh @@ -1,3 +1,3 @@ #! /bin/bash -docker compose -f keycloak-compose.yml up -d +docker-compose -f keycloak-compose.yml up -d