diff --git a/build/build.backend.docker.ps1 b/build/build.backend.docker.ps1 index a634369066..618d61e142 100644 --- a/build/build.backend.docker.ps1 +++ b/build/build.backend.docker.ps1 @@ -57,6 +57,9 @@ if ($args[0] -eq "--community" ) { $Env:INSTALLATION_TYPE = "COMMUNITY" } +Write-Host "Run OAuth2" -ForegroundColor Green +docker compose -f "$DockerDir\oauth2.yml" up -d + Set-Location -Path $RootDir $DotnetVersion = "dev" diff --git a/build/install/docker/.env b/build/install/docker/.env index cfa9f2f7f2..d5c6e8c7f6 100644 --- a/build/install/docker/.env +++ b/build/install/docker/.env @@ -84,6 +84,18 @@ MYSQL_PASSWORD=${PRODUCT}_pass DATABASE_MIGRATION=false +# oauth2 # + OAUTH_CONFIGURATION_DOCKERFILE=/configuration/Dockerfile + OAUTH_AUTHORIZATION_DOCKERFILE=/authorization/Dockerfile + OAUTH_API_DOCKERFILE=/api/Dockerfile + JDBC_USER_NAME=root + JDBC_PASSWORD=my-secret-pw + + PROFILE=zxc + + FRONTEND_ADDRESS=127.0.0.1:3005 + DOCSPACE_ADDRESS=192.168.0.17 + # service host # API_SYSTEM_HOST=${CONTAINER_PREFIX}api-system BACKUP_HOST=${CONTAINER_PREFIX}backup @@ -105,7 +117,8 @@ DOCEDITOR_HOST=${CONTAINER_PREFIX}doceditor LOGIN_HOST=${CONTAINER_PREFIX}login HELTHCHECKS_HOST=${CONTAINER_PREFIX}healthchecks - OAUTH_HOST=${CONTAINER_PREFIX}oauth + OAUTH_HOST=${CONTAINER_PREFIX}oauth-authorization + OAUTH_API_HOST=${CONTAINER_PREFIX}oauth-api # router upstream environment # SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT} diff --git a/build/install/docker/oauth2.yml b/build/install/docker/oauth2.yml new file mode 100644 index 0000000000..6c4eee67cc --- /dev/null +++ b/build/install/docker/oauth2.yml @@ -0,0 +1,46 @@ +version: "3.8" + +services: + onlyoffice-oauth-authorization: + build: + context: ../../../common/ASC.Oauth + dockerfile: ${OAUTH_AUTHORIZATION_DOCKERFILE} + container_name: onlyoffice-oauth-authorization + 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: ${MYSQL_ROOT_PASSWORD} + RABBIT_HOST: ${RABBIT_CONTAINER_NAME} + RABBIT_PORT: ${RABBIT_PORT} + RABBIT_USER_NAME: ${RABBIT_USER_NAME} + RABBIT_PASSWORD: ${RABBIT_PASSWORD} + DOCSPACE_ADDRESS: ${DOCSPACE_ADDRESS} + FRONTEND_ADDRESS: ${FRONTEND_ADDRESS} + onlyoffice-oauth-api: + build: + context: ../../../common/ASC.Oauth + dockerfile: ${OAUTH_API_DOCKERFILE} + container_name: onlyoffice-oauth-api + 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: ${MYSQL_ROOT_PASSWORD} + RABBIT_HOST: ${RABBIT_CONTAINER_NAME} + RABBIT_PORT: ${RABBIT_PORT} + RABBIT_USER_NAME: ${RABBIT_USER_NAME} + RABBIT_PASSWORD: ${RABBIT_PASSWORD} + +networks: + default: + name: ${NETWORK_NAME} + external: true