Rename oauth to identity, add flag for build in dev mode
This commit is contained in:
parent
a9d9ba70a8
commit
13f67192bf
@ -11,13 +11,14 @@ def help():
|
|||||||
# Display Help
|
# Display Help
|
||||||
print("Build and run backend and working environment. (Use 'yarn start' to run client -> https://github.com/ONLYOFFICE/DocSpace-client)")
|
print("Build and run backend and working environment. (Use 'yarn start' to run client -> https://github.com/ONLYOFFICE/DocSpace-client)")
|
||||||
print()
|
print()
|
||||||
print("Syntax: available params [-h|f|s|c|d|]")
|
print("Syntax: available params [-h|f|s|c|d|i")
|
||||||
print("options:")
|
print("options:")
|
||||||
print("h Print this Help.")
|
print("h Print this Help.")
|
||||||
print("f Force rebuild base images.")
|
print("f Force rebuild base images.")
|
||||||
print("s Run as SAAS otherwise as STANDALONE.")
|
print("s Run as SAAS otherwise as STANDALONE.")
|
||||||
print("c Run as COMMUNITY otherwise ENTERPRISE.")
|
print("c Run as COMMUNITY otherwise ENTERPRISE.")
|
||||||
print("d Run dnsmasq.")
|
print("d Run dnsmasq.")
|
||||||
|
print("i Run identity (oauth2).")
|
||||||
print()
|
print()
|
||||||
|
|
||||||
|
|
||||||
@ -37,8 +38,8 @@ if local_ip == "127.0.0.1":
|
|||||||
doceditor = f"{local_ip}:5013"
|
doceditor = f"{local_ip}:5013"
|
||||||
login = f"{local_ip}:5011"
|
login = f"{local_ip}:5011"
|
||||||
client = f"{local_ip}:5001"
|
client = f"{local_ip}:5001"
|
||||||
oauth = f"{local_ip}:8080"
|
identity_auth = f"{local_ip}:8080"
|
||||||
oauth_api = f"{local_ip}:9090"
|
identity_api = f"{local_ip}:9090"
|
||||||
management = f"{local_ip}:5015"
|
management = f"{local_ip}:5015"
|
||||||
portal_url = f"http://{local_ip}"
|
portal_url = f"http://{local_ip}"
|
||||||
|
|
||||||
@ -46,13 +47,14 @@ force = False
|
|||||||
dns = False
|
dns = False
|
||||||
standalone = True
|
standalone = True
|
||||||
community = False
|
community = False
|
||||||
|
identity = False
|
||||||
|
|
||||||
migration_type = "STANDALONE" # SAAS
|
migration_type = "STANDALONE" # SAAS
|
||||||
installation_type = "ENTERPRISE"
|
installation_type = "ENTERPRISE"
|
||||||
document_server_image_name = "onlyoffice/documentserver-de:latest"
|
document_server_image_name = "onlyoffice/documentserver-de:latest"
|
||||||
|
|
||||||
# Get the options
|
# Get the options
|
||||||
opts, args = getopt.getopt(sys.argv[1:], "hfscd")
|
opts, args = getopt.getopt(sys.argv[1:], "hfscdi")
|
||||||
for opt, arg in opts:
|
for opt, arg in opts:
|
||||||
if opt == "-h":
|
if opt == "-h":
|
||||||
help()
|
help()
|
||||||
@ -65,6 +67,8 @@ for opt, arg in opts:
|
|||||||
community = arg if arg else True
|
community = arg if arg else True
|
||||||
elif opt == "-d":
|
elif opt == "-d":
|
||||||
dns = arg if arg else True
|
dns = arg if arg else True
|
||||||
|
elif opt == "-i":
|
||||||
|
identity = arg if arg else True
|
||||||
else:
|
else:
|
||||||
print("Error: Invalid '-" + opt + "' option")
|
print("Error: Invalid '-" + opt + "' option")
|
||||||
sys.exit()
|
sys.exit()
|
||||||
@ -82,6 +86,7 @@ print(f"DOCSPACE_APP_URL: {portal_url}")
|
|||||||
print()
|
print()
|
||||||
print("FORCE REBUILD BASE IMAGES:", force)
|
print("FORCE REBUILD BASE IMAGES:", force)
|
||||||
print("Run dnsmasq:", dns)
|
print("Run dnsmasq:", dns)
|
||||||
|
print("Run identity:", identity)
|
||||||
|
|
||||||
if standalone == False:
|
if standalone == False:
|
||||||
migration_type = "SAAS"
|
migration_type = "SAAS"
|
||||||
@ -184,8 +189,8 @@ os.environ["SERVICE_DOCEDITOR"] = doceditor
|
|||||||
os.environ["SERVICE_LOGIN"] = login
|
os.environ["SERVICE_LOGIN"] = login
|
||||||
os.environ["SERVICE_MANAGEMENT"] = management
|
os.environ["SERVICE_MANAGEMENT"] = management
|
||||||
os.environ["SERVICE_CLIENT"] = client
|
os.environ["SERVICE_CLIENT"] = client
|
||||||
os.environ["SERVICE_OAUTH"] = oauth
|
os.environ["SERVICE_IDENTITY"] = identity_auth
|
||||||
os.environ["SERVICE_OAUTH_API"] = oauth_api
|
os.environ["SERVICE_IDENTITY_API"] = identity_api
|
||||||
os.environ["ROOT_DIR"] = dir
|
os.environ["ROOT_DIR"] = dir
|
||||||
os.environ["BUILD_PATH"] = "/var/www"
|
os.environ["BUILD_PATH"] = "/var/www"
|
||||||
os.environ["SRC_PATH"] = os.path.join(dir, "publish/services")
|
os.environ["SRC_PATH"] = os.path.join(dir, "publish/services")
|
||||||
@ -194,8 +199,9 @@ os.environ["APP_URL_PORTAL"] = portal_url
|
|||||||
os.environ["MIGRATION_TYPE"] = migration_type
|
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"])
|
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")
|
if identity:
|
||||||
subprocess.run(["docker-compose", "-f",os.path.join(dockerDir, "oauth2.yml"), "up", "-d" ])
|
print("Run identity")
|
||||||
|
subprocess.run(["docker-compose", "-f",os.path.join(dockerDir, "identity.yml"), "up", "-d" ])
|
||||||
|
|
||||||
print()
|
print()
|
||||||
print("Run script directory:", dir)
|
print("Run script directory:", dir)
|
||||||
|
@ -31,9 +31,9 @@ if containers or images:
|
|||||||
db_command = f"docker compose -f {os.path.join(docker_dir, 'db.yml')} down --volumes"
|
db_command = f"docker compose -f {os.path.join(docker_dir, 'db.yml')} down --volumes"
|
||||||
subprocess.run(db_command, shell=True)
|
subprocess.run(db_command, shell=True)
|
||||||
|
|
||||||
print("Remove docker contatiners 'OAuth'")
|
print("Remove docker contatiners 'Identity'")
|
||||||
db_command = f"docker compose -f {os.path.join(docker_dir, 'oauth2.yml')} down --volumes"
|
identity_command = f"docker compose -f {os.path.join(docker_dir, 'identity.yml')} down --volumes"
|
||||||
subprocess.run(db_command, shell=True)
|
subprocess.run(identity_command, shell=True)
|
||||||
|
|
||||||
print("Remove docker volumes")
|
print("Remove docker volumes")
|
||||||
volumes_command = f"docker volume prune -fa"
|
volumes_command = f"docker volume prune -fa"
|
||||||
|
@ -125,19 +125,21 @@
|
|||||||
NETWORK_NAME=${PRODUCT}
|
NETWORK_NAME=${PRODUCT}
|
||||||
|
|
||||||
COMPOSE_IGNORE_ORPHANS=True
|
COMPOSE_IGNORE_ORPHANS=True
|
||||||
# oauth2 #
|
# identity #
|
||||||
OAUTH_DOCKERFILE=/Dockerfile
|
IDENTITY_DOCKERFILE=/Dockerfile
|
||||||
|
|
||||||
JDBC_USER_NAME=root
|
JDBC_USER_NAME=root
|
||||||
JDBC_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
JDBC_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||||
|
JDBC_URL=${MYSQL_CONTAINER_NAME}
|
||||||
|
JDBC_DATABASE=${MYSQL_DATABASE}
|
||||||
|
|
||||||
PROFILE="dev"
|
IDENTITY_PROFILE="dev"
|
||||||
|
|
||||||
OAUTH_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}oauth_migration
|
IDENTITY_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity_migration
|
||||||
OAUTH_MIGRATION_SERVER_PORT=8081
|
IDENTITY_MIGRATION_SERVER_PORT=8081
|
||||||
OAUTH_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-authorization
|
IDENTITY_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-authorization
|
||||||
OAUTH_AUTHORIZATION_SERVER_PORT=8080
|
IDENTITY_AUTHORIZATION_SERVER_PORT=8080
|
||||||
OAUTH_API_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-api
|
IDENTITY_API_CONTAINER_NAME=${CONTAINER_PREFIX}identity-api
|
||||||
OAUTH_API_SERVER_PORT=9090
|
IDENTITY_API_SERVER_PORT=9090
|
||||||
|
|
||||||
REDIS_ADDRESSES=redis://onlyoffice-redis:6379
|
REDIS_ADDRESSES=redis://onlyoffice-redis:6379
|
||||||
|
@ -176,8 +176,8 @@ RUN chown nginx:nginx /etc/nginx/* -R && \
|
|||||||
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9090/$service_identity_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:8080/$service_identity/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
||||||
if [[ -z "${SERVICE_MANAGEMENT}" ]] ; then sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
if [[ -z "${SERVICE_MANAGEMENT}" ]] ; then sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
||||||
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
|
@ -85,12 +85,12 @@ RUN mkdir -p /var/log/onlyoffice && \
|
|||||||
chown onlyoffice:onlyoffice /var/www -R && \
|
chown onlyoffice:onlyoffice /var/www -R && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get install -yq \
|
apt-get install -yq \
|
||||||
sudo \
|
sudo \
|
||||||
nano \
|
nano \
|
||||||
curl \
|
curl \
|
||||||
vim \
|
vim \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
libgdiplus && \
|
libgdiplus && \
|
||||||
pip3 install --upgrade --break-system-packages jsonpath-ng multipledispatch netaddr netifaces && \
|
pip3 install --upgrade --break-system-packages jsonpath-ng multipledispatch netaddr netifaces && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
@ -115,12 +115,12 @@ RUN mkdir -p /var/log/onlyoffice && \
|
|||||||
chown onlyoffice:onlyoffice /var/www -R && \
|
chown onlyoffice:onlyoffice /var/www -R && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get install -yq \
|
apt-get install -yq \
|
||||||
sudo \
|
sudo \
|
||||||
nano \
|
nano \
|
||||||
curl \
|
curl \
|
||||||
vim \
|
vim \
|
||||||
python3-pip && \
|
python3-pip && \
|
||||||
pip3 install --upgrade --break-system-packages jsonpath-ng multipledispatch netaddr netifaces && \
|
pip3 install --upgrade --break-system-packages jsonpath-ng multipledispatch netaddr netifaces && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/
|
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/
|
||||||
@ -170,8 +170,8 @@ RUN sed -i 's/127.0.0.1:5010/$service_api_system/' /etc/nginx/conf.d/onlyoffice.
|
|||||||
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9090/$service_identity_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:8080/$service_identity/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
||||||
if [[ -z "${SERVICE_MANAGEMENT}" ]] ; then sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
if [[ -z "${SERVICE_MANAGEMENT}" ]] ; then sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
|
||||||
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
@ -255,11 +255,11 @@ ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
|
|||||||
WORKDIR ${BUILD_PATH}/products/ASC.Files/service/
|
WORKDIR ${BUILD_PATH}/products/ASC.Files/service/
|
||||||
|
|
||||||
RUN echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list && \
|
RUN echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list && \
|
||||||
apt-key adv --keyserver keys.gnupg.net --recv-keys 3B4FE6ACC0B21F32 && \
|
apt-key adv --keyserver keys.gnupg.net --recv-keys 3B4FE6ACC0B21F32 && \
|
||||||
apt-key adv --keyserver keys.gnupg.net --recv-keys 871920D1991BC93C && \
|
apt-key adv --keyserver keys.gnupg.net --recv-keys 871920D1991BC93C && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get install -yq libssl1.1 && \
|
apt-get install -yq libssl1.1 && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py
|
COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py
|
||||||
COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ .
|
COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ .
|
||||||
|
@ -36,11 +36,11 @@ RUN mkdir -p /var/log/onlyoffice && \
|
|||||||
chown onlyoffice:onlyoffice /var/www -R && \
|
chown onlyoffice:onlyoffice /var/www -R && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get install -yq \
|
apt-get install -yq \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
nano \
|
nano \
|
||||||
curl \
|
curl \
|
||||||
vim \
|
vim \
|
||||||
libgdiplus && \
|
libgdiplus && \
|
||||||
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces --break-system-packages && \
|
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces --break-system-packages && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
@ -64,10 +64,10 @@ RUN mkdir -p /var/log/onlyoffice && \
|
|||||||
chown onlyoffice:onlyoffice /var/www -R && \
|
chown onlyoffice:onlyoffice /var/www -R && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get install -yq \
|
apt-get install -yq \
|
||||||
nano \
|
nano \
|
||||||
curl \
|
curl \
|
||||||
vim \
|
vim \
|
||||||
python3-pip && \
|
python3-pip && \
|
||||||
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces --break-system-packages && \
|
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces --break-system-packages && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
@ -122,8 +122,8 @@ RUN chown onlyoffice:onlyoffice /etc/nginx/* -R && \
|
|||||||
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:9090/$service_identity_api/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:8080/$service_identity/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||||
|
@ -54,16 +54,16 @@ map $SERVICE_API $service_api {
|
|||||||
default $SERVICE_API;
|
default $SERVICE_API;
|
||||||
}
|
}
|
||||||
|
|
||||||
map $SERVICE_OAUTH_API $service_oauth_api {
|
map $SERVICE_IDENTITY_API $service_identity_api {
|
||||||
volatile;
|
volatile;
|
||||||
"" 127.0.0.1:9090;
|
"" 127.0.0.1:9090;
|
||||||
default $SERVICE_OAUTH_API;
|
default $SERVICE_IDENTITY_API;
|
||||||
}
|
}
|
||||||
|
|
||||||
map $SERVICE_OAUTH $service_oauth {
|
map $SERVICE_IDENTITY $service_identity {
|
||||||
volatile;
|
volatile;
|
||||||
"" 127.0.0.1:8080;
|
"" 127.0.0.1:8080;
|
||||||
default $SERVICE_OAUTH;
|
default $SERVICE_IDENTITY;
|
||||||
}
|
}
|
||||||
|
|
||||||
map $SERVICE_STUDIO $service_studio {
|
map $SERVICE_STUDIO $service_studio {
|
||||||
|
@ -264,8 +264,8 @@ services:
|
|||||||
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
||||||
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
||||||
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
||||||
- SERVICE_OAUTH_API=${SERVICE_OAUTH_API}
|
- SERVICE_IDENTITY_API=${SERVICE_IDENTITY_API}
|
||||||
- SERVICE_OAUTH=${SERVICE_OAUTH}
|
- SERVICE_IDENTITY=${SERVICE_IDENTITY}
|
||||||
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
||||||
- SERVICE_API=${SERVICE_API}
|
- SERVICE_API=${SERVICE_API}
|
||||||
- SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
|
- SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
|
||||||
|
@ -208,8 +208,8 @@ services:
|
|||||||
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
||||||
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
||||||
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
||||||
- SERVICE_OAUTH_API=${SERVICE_OAUTH_API}
|
- SERVICE_IDENTITY_API=${SERVICE_IDENTITY_API}
|
||||||
- SERVICE_OAUTH=${SERVICE_OAUTH}
|
- SERVICE_IDENTITY=${SERVICE_IDENTITY}
|
||||||
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
||||||
- SERVICE_API=${SERVICE_API}
|
- SERVICE_API=${SERVICE_API}
|
||||||
- SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
|
- SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
|
||||||
|
69
install/docker/identity.yml
Normal file
69
install/docker/identity.yml
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
onlyoffice-identity-authorization:
|
||||||
|
build:
|
||||||
|
context: ../../../server/common/ASC.Identity
|
||||||
|
dockerfile: ${IDENTITY_DOCKERFILE}
|
||||||
|
args:
|
||||||
|
- MODULE=authorization/authorization-container
|
||||||
|
container_name: ${IDENTITY_AUTHORIZATION_CONTAINER_NAME}
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- 8080:8080
|
||||||
|
environment:
|
||||||
|
- SPRING_PROFILES_ACTIVE=${IDENTITY_PROFILE}
|
||||||
|
- SPRING_APPLICATION_NAME=ASC.Identity.Authorization
|
||||||
|
- SERVER_PORT=${IDENTITY_AUTHORIZATION_SERVER_PORT}
|
||||||
|
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
||||||
|
- JDBC_URL=${JDBC_URL}
|
||||||
|
- JDBC_USER_NAME=${JDBC_USER_NAME}
|
||||||
|
- JDBC_DATABASE=${JDBC_DATABASE}
|
||||||
|
- RABBIT_HOST=onlyoffice-rabbitmq
|
||||||
|
- REDIS_HOST=onlyoffice-redis
|
||||||
|
depends_on:
|
||||||
|
- onlyoffice-identity-migration
|
||||||
|
|
||||||
|
onlyoffice-identity-api:
|
||||||
|
build:
|
||||||
|
context: ../../../server/common/ASC.Identity
|
||||||
|
dockerfile: ${IDENTITY_DOCKERFILE}
|
||||||
|
args:
|
||||||
|
- MODULE=registration/registration-container
|
||||||
|
container_name: ${IDENTITY_API_CONTAINER_NAME}
|
||||||
|
ports:
|
||||||
|
- 9090:9090
|
||||||
|
environment:
|
||||||
|
- SPRING_PROFILES_ACTIVE=${PROFILE}
|
||||||
|
- SPRING_APPLICATION_NAME=ASC.Identity.Registration
|
||||||
|
- SERVER_PORT=${IDENTITY_API_SERVER_PORT}
|
||||||
|
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
||||||
|
- JDBC_URL=${JDBC_URL}
|
||||||
|
- JDBC_USER_NAME=${JDBC_USER_NAME}
|
||||||
|
- JDBC_DATABASE=${JDBC_DATABASE}
|
||||||
|
- RABBIT_HOST=onlyoffice-rabbitmq
|
||||||
|
- REDIS_HOST=onlyoffice-redis
|
||||||
|
depends_on:
|
||||||
|
- onlyoffice-identity-migration
|
||||||
|
|
||||||
|
onlyoffice-identity-migration:
|
||||||
|
build:
|
||||||
|
context: ../../../server/common/ASC.Identity
|
||||||
|
dockerfile: ${IDENTITY_DOCKERFILE}
|
||||||
|
args:
|
||||||
|
- MODULE=infrastructure/infrastructure-migration-runner
|
||||||
|
container_name: ${IDENTITY_MIGRATION_CONTAINER_NAME}
|
||||||
|
restart: "no"
|
||||||
|
ports:
|
||||||
|
- 8081:8081
|
||||||
|
environment:
|
||||||
|
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
||||||
|
- JDBC_URL=${JDBC_URL}
|
||||||
|
- JDBC_USER_NAME=${JDBC_USER_NAME}
|
||||||
|
- JDBC_DATABASE=${JDBC_DATABASE}
|
||||||
|
- RABBIT_HOST=onlyoffice-rabbitmq
|
||||||
|
- REDIS_HOST=onlyoffice-redis
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
name: ${NETWORK_NAME}
|
||||||
|
external: true
|
@ -1,69 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
onlyoffice-oauth-authorization:
|
|
||||||
build:
|
|
||||||
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:
|
|
||||||
- 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
|
|
||||||
dockerfile: ${OAUTH_DOCKERFILE}
|
|
||||||
args:
|
|
||||||
- MODULE=registration/registration-container
|
|
||||||
container_name: ${OAUTH_API_CONTAINER_NAME}
|
|
||||||
ports:
|
|
||||||
- 9090:9090
|
|
||||||
environment:
|
|
||||||
- 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}
|
|
||||||
external: true
|
|
Loading…
Reference in New Issue
Block a user