Update docker build for oauth services

build.backend.docker.py

@@ -194,8 +194,10 @@ os.environ["APP_URL_PORTAL"] = portal_url
 os.environ["MIGRATION_TYPE"] = migration_type
 subprocess.run(["docker-compose", "-f", os.path.join(dockerDir, "docspace.profiles.yml"), "-f", os.path.join(dockerDir, "docspace.overcome.yml"), "--profile", "migration-runner", "--profile", "backend-local", "up", "-d"])
 
+print("Run OAuth2 migration")
+subprocess.run(["docker-compose", "-f",os.path.join(dockerDir, "oauth2-migration.yml"), "up", "-d" ])
+
 print("Run OAuth2")
-os.environ["DOCSPACE_ADDRESS"] = local_ip
 subprocess.run(["docker-compose", "-f",os.path.join(dockerDir, "oauth2.yml"), "up", "-d" ])
 
 print()

install/docker/.env

@@ -126,15 +126,18 @@
 
     COMPOSE_IGNORE_ORPHANS=True
 # oauth2 #
-    OAUTH_AUTHORIZATION_DOCKERFILE=/Dockerfile
-    OAUTH_API_DOCKERFILE=/Dockerfile
+    OAUTH_DOCKERFILE=/Dockerfile
 
     JDBC_USER_NAME=root
     JDBC_PASSWORD=${MYSQL_ROOT_PASSWORD}
 
     PROFILE="dev"
     
+    OAUTH_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}oauth_migration
+    OAUTH_MIGRATION_SERVER_PORT=8081
     OAUTH_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-authorization
+    OAUTH_AUTHORIZATION_SERVER_PORT=8080
     OAUTH_API_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-api
+    OAUTH_API_SERVER_PORT=9090
 
     REDIS_ADDRESSES=redis://onlyoffice-redis:6379

install/docker/oauth2.yml

@@ -3,42 +3,66 @@ version: "3.8"
 services:
   onlyoffice-oauth-authorization:
     build:
-      context: ../../../server/common/ASC.Identity/authorization
-      dockerfile: ${OAUTH_AUTHORIZATION_DOCKERFILE}
+      context: ../../../server/common/ASC.Identity
+      dockerfile: ${OAUTH_DOCKERFILE}
+      args: 
+        - MODULE=authorization/authorization-container
     container_name: ${OAUTH_AUTHORIZATION_CONTAINER_NAME}
     restart: always
     ports:
       - 8080:8080
     environment:
-      PROFILE: ${PROFILE}
-      JDBC_URL: ${MYSQL_CONTAINER_NAME}
-      JDBC_DATABASE: ${MYSQL_DATABASE}
-      JDBC_USER_NAME: ${JDBC_USER_NAME}
-      JDBC_PASSWORD: ${JDBC_PASSWORD}
-      RABBIT_HOST: ${RABBIT_CONTAINER_NAME}
-      RABBIT_PORT: ${RABBIT_PORT}
-      RABBIT_USER_NAME: ${RABBIT_USER_NAME}
-      RABBIT_PASSWORD: ${RABBIT_PASSWORD}
-      REDIS_ADDRESSES: ${REDIS_ADDRESSES}
+      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_APPLICATION_NAME=ASC.Identity.Authorization
+      - SERVER_PORT=8080
+      - JDBC_PASSWORD=my-secret-pw
+      - JDBC_URL=onlyoffice-mysql-server
+      - JDBC_USER_NAME=root
+      - JDBC_DATABASE=docspace
+      - RABBIT_HOST=onlyoffice-rabbitmq
+      - REDIS_HOST=onlyoffice-redis
+    depends_on:
+      - onlyoffice-oauth-migration
+
   onlyoffice-oauth-api:
     build:
-      context: ../../../server/common/ASC.Identity/api
-      dockerfile: ${OAUTH_API_DOCKERFILE}
+      context: ../../../server/common/ASC.Identity
+      dockerfile: ${OAUTH_DOCKERFILE}
+      args: 
+        - MODULE=registration/registration-container
     container_name: ${OAUTH_API_CONTAINER_NAME}
     ports:
       - 9090:9090
-      - 8585:8585
     environment:
-      PROFILE: ${PROFILE}
-      JDBC_URL: ${MYSQL_CONTAINER_NAME}
-      JDBC_DATABASE: ${MYSQL_DATABASE}
-      JDBC_USER_NAME: ${JDBC_USER_NAME}
-      JDBC_PASSWORD: ${JDBC_PASSWORD}
-      RABBIT_HOST: ${RABBIT_CONTAINER_NAME}
-      RABBIT_PORT: ${RABBIT_PORT}
-      RABBIT_USER_NAME: ${RABBIT_USER_NAME}
-      RABBIT_PASSWORD: ${RABBIT_PASSWORD}
-      REDIS_ADDRESSES: ${REDIS_ADDRESSES}
+      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_APPLICATION_NAME=ASC.Identity.Registration
+      - SERVER_PORT=9090
+      - JDBC_PASSWORD=my-secret-pw
+      - JDBC_URL=onlyoffice-mysql-server
+      - JDBC_USER_NAME=root
+      - JDBC_DATABASE=docspace
+      - RABBIT_HOST=onlyoffice-rabbitmq
+      - REDIS_HOST=onlyoffice-redis
+    depends_on:
+      - onlyoffice-oauth-migration
+
+  onlyoffice-oauth-migration:
+    build:
+      context: ../../../server/common/ASC.Identity
+      dockerfile: ${OAUTH_DOCKERFILE}
+      args: 
+        - MODULE=infrastructure/infrastructure-migration-runner
+    container_name: ${OAUTH_MIGRATION_CONTAINER_NAME} 
+    restart: "no"
+    ports:
+      - 8081:8081
+    environment:
+      - JDBC_PASSWORD=my-secret-pw
+      - JDBC_URL=onlyoffice-mysql-server
+      - JDBC_USER_NAME=root
+      - JDBC_DATABASE=docspace
+      - RABBIT_HOST=onlyoffice-rabbitmq
+      - REDIS_HOST=onlyoffice-redis
 networks:
   default:
     name: ${NETWORK_NAME}