Compare commits
110 Commits
master
...
feature/re
Author | SHA1 | Date | |
---|---|---|---|
e5d569da54 | |||
290778650c | |||
|
c1730c2ad2 | ||
|
f4220983f1 | ||
0cc49730f3 | |||
566171800f | |||
b43d9a5cda | |||
f0e44bf6a6 | |||
57db3d548c | |||
3c2f1bf458 | |||
a090e14a30 | |||
12ab50d3a5 | |||
84a7d52c1b | |||
2c892e1a6c | |||
48e047e660 | |||
cb39bacffb | |||
|
859a3bb009 | ||
4c7376852a | |||
ecb6cba47e | |||
dc1f9020fc | |||
a376f1f5ed | |||
c11d0f6123 | |||
7b9928be7e | |||
01c919d7ca | |||
c523250337 | |||
c312ba632b | |||
13f67192bf | |||
a9d9ba70a8 | |||
2813bd572f | |||
1cd5d9a2e9 | |||
6d0c14ebc3 | |||
33ac365992 | |||
9d9e76acb1 | |||
26f8014056 | |||
aff3c13d5c | |||
58f8ef4d27 | |||
415fe6e605 | |||
3f2087a60c | |||
5c567ad109 | |||
f4e91b7b3d | |||
|
9f88fc61f0 | ||
0cb0448c44 | |||
191ab2db6f | |||
3545708a25 | |||
5aa3339a6f | |||
c959e430f2 | |||
dc099c3eb1 | |||
babd83dc2c | |||
bbd4d8013d | |||
2ee869d9bb | |||
3d8d1c5e21 | |||
b567e10880 | |||
1517c48add | |||
e248c9d317 | |||
bbc46c5676 | |||
893e3dca78 | |||
bb30917778 | |||
4a3b1d943e | |||
e1c2632e09 | |||
67821b7297 | |||
5edc87293a | |||
40d19b1746 | |||
f745a71e43 | |||
8f0ed06219 | |||
d4efd04825 | |||
d8eff9bdb8 | |||
242340255b | |||
d7ea6fad02 | |||
ad047bc372 | |||
e02510be1d | |||
bb5b8cccdd | |||
ba23f9bb7b | |||
84afb50b66 | |||
aa6545bfe1 | |||
4b888c6640 | |||
a34bedef1e | |||
f6dca051ac | |||
ca73c5b0c4 | |||
807215a0cb | |||
2381fcf68f | |||
8ee516850b | |||
0f9d61b9f0 | |||
bbce172bba | |||
5f8718c78d | |||
76e439bad3 | |||
d8a535432d | |||
6956adc231 | |||
310f2d5dc5 | |||
61c920555b | |||
8b0bca3a44 | |||
74e94c0a10 | |||
dc1274fb88 | |||
3b9c56c5f4 | |||
a56a46236c | |||
17f6195d8c | |||
31bf677340 | |||
8e751923d9 | |||
ebdffb55ea | |||
ac496b82a2 | |||
6d6116c5ce | |||
11c322f03b | |||
2a36d19707 | |||
4a7f1710de | |||
a4d69eebe8 | |||
e173c5932d | |||
fbaace1941 | |||
a0b9e56097 | |||
06c63bdb6f | |||
d5b009554e | |||
eefb4b5e2e |
33
.github/workflows/ci-oci-install.yml
vendored
33
.github/workflows/ci-oci-install.yml
vendored
@ -5,9 +5,10 @@ on:
|
||||
types: [opened, reopened, synchronize]
|
||||
paths:
|
||||
- '.github/workflows/ci-oci-install.yml'
|
||||
- 'install/OneClickInstall/**'
|
||||
- '!install/OneClickInstall/install-Docker.sh'
|
||||
- '!install/OneClickInstall/docspace-install.sh'
|
||||
- 'install/OneClickInstall/install-Debian/**'
|
||||
- 'install/OneClickInstall/install-RedHat/**'
|
||||
- 'install/OneClickInstall/install-Debian.sh'
|
||||
- 'install/OneClickInstall/install-RedHat.sh'
|
||||
|
||||
schedule:
|
||||
- cron: '00 20 * * 6' # At 23:00 on Saturday.
|
||||
@ -57,6 +58,19 @@ jobs:
|
||||
outputs:
|
||||
matrix: ${{ steps.set-matrix.outputs.matrix }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
if: github.event_name == 'pull_request'
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Determine affected distributions
|
||||
id: determine-distros
|
||||
if: github.event_name == 'pull_request'
|
||||
run: |
|
||||
CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }})
|
||||
echo "debian_changed=$(echo "$CHANGED_FILES" | grep -q 'install-Debian' && echo true || echo false)" >> $GITHUB_ENV
|
||||
echo "redhat_changed=$(echo "$CHANGED_FILES" | grep -q 'install-RedHat' && echo true || echo false)" >> $GITHUB_ENV
|
||||
|
||||
- name: Set matrix names
|
||||
id: set-matrix
|
||||
@ -69,11 +83,20 @@ jobs:
|
||||
{"execute": '${{ github.event.inputs.debian12 || true }}', "name": "Debian12", "os": "debian12", "distr": "generic"},
|
||||
{"execute": '${{ github.event.inputs.ubuntu2004 || true }}', "name": "Ubuntu20.04", "os": "ubuntu2004", "distr": "generic"},
|
||||
{"execute": '${{ github.event.inputs.ubuntu2204 || true }}', "name": "Ubuntu22.04", "os": "ubuntu2204", "distr": "generic"},
|
||||
{"execute": '${{ github.event.inputs.ubuntu2204 || true }}', "name": "Ubuntu24.04", "os": "ubuntu-24.04", "distr": "bento"},
|
||||
{"execute": '${{ github.event.inputs.ubuntu2404 || true }}', "name": "Ubuntu24.04", "os": "ubuntu-24.04", "distr": "bento"},
|
||||
{"execute": '${{ github.event.inputs.fedora39 || true }}', "name": "Fedora39", "os": "39-cloud-base", "distr": "fedora"},
|
||||
{"execute": '${{ github.event.inputs.fedora40 || true }}', "name": "Fedora40", "os": "fedora-40", "distr": "bento"}
|
||||
]
|
||||
}' | jq -c '{include: [.include[] | select(.execute == true)]}')
|
||||
}' | jq -c '.include')
|
||||
|
||||
matrix=$(jq -c --arg REDHAT_CHANGED "${{ env.redhat_changed }}" --arg DEBIAN_CHANGED "${{ env.debian_changed }}" '
|
||||
{ include: [.[] | select(
|
||||
($REDHAT_CHANGED == "true" and $DEBIAN_CHANGED == "true" and .execute == true) or
|
||||
($REDHAT_CHANGED == "true" and (.name | test("CentOS|Fedora"))) or
|
||||
($DEBIAN_CHANGED == "true" and (.name | test("Debian|Ubuntu"))) or
|
||||
($REDHAT_CHANGED == "false" and $DEBIAN_CHANGED == "false" and .execute == true))]
|
||||
}' <<< "$matrix")
|
||||
|
||||
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
|
||||
|
||||
vagrant-up:
|
||||
|
@ -11,13 +11,14 @@ def help():
|
||||
# Display Help
|
||||
print("Build and run backend and working environment. (Use 'yarn start' to run client -> https://github.com/ONLYOFFICE/DocSpace-client)")
|
||||
print()
|
||||
print("Syntax: available params [-h|f|s|c|d|]")
|
||||
print("Syntax: available params [-h|f|s|c|d|i")
|
||||
print("options:")
|
||||
print("h Print this Help.")
|
||||
print("f Force rebuild base images.")
|
||||
print("s Run as SAAS otherwise as STANDALONE.")
|
||||
print("c Run as COMMUNITY otherwise ENTERPRISE.")
|
||||
print("d Run dnsmasq.")
|
||||
print("i Run identity (oauth2).")
|
||||
print()
|
||||
|
||||
|
||||
@ -37,6 +38,8 @@ if local_ip == "127.0.0.1":
|
||||
doceditor = f"{local_ip}:5013"
|
||||
login = f"{local_ip}:5011"
|
||||
client = f"{local_ip}:5001"
|
||||
identity_auth = f"{local_ip}:8080"
|
||||
identity_api = f"{local_ip}:9090"
|
||||
management = f"{local_ip}:5015"
|
||||
portal_url = f"http://{local_ip}"
|
||||
|
||||
@ -44,13 +47,14 @@ force = False
|
||||
dns = False
|
||||
standalone = True
|
||||
community = False
|
||||
identity = False
|
||||
|
||||
migration_type = "STANDALONE" # SAAS
|
||||
installation_type = "ENTERPRISE"
|
||||
document_server_image_name = "onlyoffice/documentserver-de:latest"
|
||||
|
||||
# Get the options
|
||||
opts, args = getopt.getopt(sys.argv[1:], "hfscd")
|
||||
opts, args = getopt.getopt(sys.argv[1:], "hfscdi")
|
||||
for opt, arg in opts:
|
||||
if opt == "-h":
|
||||
help()
|
||||
@ -63,6 +67,8 @@ for opt, arg in opts:
|
||||
community = arg if arg else True
|
||||
elif opt == "-d":
|
||||
dns = arg if arg else True
|
||||
elif opt == "-i":
|
||||
identity = arg if arg else True
|
||||
else:
|
||||
print("Error: Invalid '-" + opt + "' option")
|
||||
sys.exit()
|
||||
@ -80,6 +86,7 @@ print(f"DOCSPACE_APP_URL: {portal_url}")
|
||||
print()
|
||||
print("FORCE REBUILD BASE IMAGES:", force)
|
||||
print("Run dnsmasq:", dns)
|
||||
print("Run identity:", identity)
|
||||
|
||||
if standalone == False:
|
||||
migration_type = "SAAS"
|
||||
@ -182,6 +189,8 @@ os.environ["SERVICE_DOCEDITOR"] = doceditor
|
||||
os.environ["SERVICE_LOGIN"] = login
|
||||
os.environ["SERVICE_MANAGEMENT"] = management
|
||||
os.environ["SERVICE_CLIENT"] = client
|
||||
os.environ["SERVICE_IDENTITY"] = identity_auth
|
||||
os.environ["SERVICE_IDENTITY_API"] = identity_api
|
||||
os.environ["ROOT_DIR"] = dir
|
||||
os.environ["BUILD_PATH"] = "/var/www"
|
||||
os.environ["SRC_PATH"] = os.path.join(dir, "publish/services")
|
||||
@ -191,6 +200,10 @@ 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"])
|
||||
|
||||
if identity:
|
||||
print("Run identity")
|
||||
subprocess.run(["docker-compose", "-f",os.path.join(dockerDir, "identity.yml"), "up", "-d" ])
|
||||
|
||||
print()
|
||||
print("Run script directory:", dir)
|
||||
print("Root directory:", dir)
|
||||
|
26
build.backend.dotnet.bat
Normal file
26
build.backend.dotnet.bat
Normal file
@ -0,0 +1,26 @@
|
||||
@echo off
|
||||
|
||||
echo Start build backend...
|
||||
echo.
|
||||
|
||||
cd /D "%~dp0"
|
||||
call runasadmin.bat "%~dpnx0"
|
||||
|
||||
if %errorlevel% == 0 (
|
||||
call start\stop.bat nopause
|
||||
dotnet build ..\server\asc.web.slnf /fl1 /flp1:logfile=asc.web.log;verbosity=normal
|
||||
echo.
|
||||
)
|
||||
|
||||
if %errorlevel% == 0 (
|
||||
call start\start.bat nopause
|
||||
)
|
||||
|
||||
echo.
|
||||
|
||||
if "%1"=="nopause" goto end
|
||||
pause
|
||||
|
||||
|
||||
|
||||
:end
|
@ -31,6 +31,10 @@ if containers or images:
|
||||
db_command = f"docker compose -f {os.path.join(docker_dir, 'db.yml')} down --volumes"
|
||||
subprocess.run(db_command, shell=True)
|
||||
|
||||
print("Remove docker contatiners 'Identity'")
|
||||
identity_command = f"docker compose -f {os.path.join(docker_dir, 'identity.yml')} down --volumes"
|
||||
subprocess.run(identity_command, shell=True)
|
||||
|
||||
print("Remove docker volumes")
|
||||
volumes_command = f"docker volume prune -fa"
|
||||
subprocess.run(volumes_command, shell=True)
|
||||
|
@ -38,7 +38,10 @@
|
||||
},
|
||||
"themelimit": "9",
|
||||
"oidc": {
|
||||
"authority": ""
|
||||
"authority": "",
|
||||
"disableValidateToken": "true",
|
||||
"requireHttps": "false",
|
||||
"showPII": "true"
|
||||
},
|
||||
"server-root": "",
|
||||
"username": {
|
||||
@ -123,7 +126,7 @@
|
||||
"api-system": "",
|
||||
"api-cache": "",
|
||||
"images": "static/images",
|
||||
"hide-settings": "Monitoring,LdapSettings,DocService,MailService,PublicPortal,ProxyHttpContent,SpamSubscription,FullTextSearch",
|
||||
"hide-settings": "Monitoring,LdapSettings,DocService,MailService,PublicPortal,ProxyHttpContent,SpamSubscription,FullTextSearch,IdentityServer",
|
||||
"hub": {
|
||||
"url": "/socket.io",
|
||||
"internal": "http://localhost:9899/"
|
||||
|
@ -9,6 +9,6 @@ server=8.8.4.4
|
||||
server=8.8.8.8
|
||||
strict-order
|
||||
#serve all .company queries using a specific nameserver
|
||||
server=/site/127.0.0.1
|
||||
server=/site/192.168.0.18
|
||||
#explicitly define host-ip mappings
|
||||
address=/docspace.site/127.0.0.1
|
||||
address=/docspace.site/192.168.0.18
|
12
config/nginx/includes/server-dashboards.conf
Normal file
12
config/nginx/includes/server-dashboards.conf
Normal file
@ -0,0 +1,12 @@
|
||||
location ^~ /dashboards/ {
|
||||
auth_basic "Restricted Access";
|
||||
auth_basic_user_file /etc/nginx/.htpasswd_dashboards;
|
||||
|
||||
rewrite ^/dashboards(/.*)$ $1 break;
|
||||
proxy_pass http://127.0.0.1:5601;
|
||||
proxy_redirect off;
|
||||
proxy_buffering off;
|
||||
|
||||
proxy_set_header Connection "Keep-Alive";
|
||||
proxy_set_header Proxy-Connection "Keep-Alive";
|
||||
}
|
@ -54,6 +54,13 @@ map $request_uri $content_security_policy {
|
||||
~*\/(ds-vpath)\/ "default-src *; script-src * 'unsafe-inline' 'unsafe-eval'; script-src-elem * 'unsafe-inline'; img-src * data:; style-src * 'unsafe-inline' data:; font-src * data:; frame-src * ascdesktop:; object-src; connect-src * ascdesktop:;";
|
||||
}
|
||||
|
||||
map $request_time $request_time_ms {
|
||||
~^0\.000$ 0;
|
||||
~^0\.(?:0*)([^0].*)$ $1;
|
||||
~^([^0][^.]*)\.(.*)$ $1$2;
|
||||
}
|
||||
|
||||
|
||||
include /etc/nginx/includes/onlyoffice-*.conf;
|
||||
|
||||
server_names_hash_bucket_size 128;
|
||||
@ -158,18 +165,7 @@ server {
|
||||
|
||||
}
|
||||
|
||||
location ^~ /dashboards/ {
|
||||
auth_basic "Restricted Access";
|
||||
auth_basic_user_file /etc/nginx/.htpasswd_dashboards;
|
||||
|
||||
rewrite ^/dashboards(/.*)$ $1 break;
|
||||
proxy_pass http://127.0.0.1:5601;
|
||||
proxy_redirect off;
|
||||
proxy_buffering off;
|
||||
|
||||
proxy_set_header Connection "Keep-Alive";
|
||||
proxy_set_header Proxy-Connection "Keep-Alive";
|
||||
}
|
||||
include /etc/nginx/includes/server-*.conf;
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:5001;
|
||||
@ -239,19 +235,9 @@ server {
|
||||
proxy_pass http://127.0.0.1:5015;
|
||||
proxy_redirect off;
|
||||
|
||||
location ~* /static/favicon.ico {
|
||||
try_files /$basename /index.html =404;
|
||||
}
|
||||
|
||||
location ~* /static/images/(.*)$ {
|
||||
location ~* /_next/public/images/(.*)$ {
|
||||
try_files /images/$1 /index.html =404;
|
||||
}
|
||||
|
||||
location ~* /static/fonts/(?<content>[^/]+) {
|
||||
try_files /fonts/$content/$basename /index.html =404;
|
||||
}
|
||||
|
||||
rewrite management/(.*) /$1 break;
|
||||
}
|
||||
|
||||
location ~* /static/fonts/(?<content>[^/]+) {
|
||||
@ -288,6 +274,9 @@ server {
|
||||
}
|
||||
|
||||
location /api/2.0 {
|
||||
add_header Trailer Server-Timing;
|
||||
add_header Server-Timing "proxy-request-time;dur=${request_time_ms}";
|
||||
|
||||
location ~* /(files|privacyroom) {
|
||||
proxy_pass http://127.0.0.1:5007;
|
||||
}
|
||||
@ -323,6 +312,25 @@ server {
|
||||
location ~* /migration {
|
||||
proxy_pass http://127.0.0.1:5034;
|
||||
}
|
||||
|
||||
location ~* /(clients|scopes) {
|
||||
proxy_pass http://127.0.0.1:9090;
|
||||
}
|
||||
|
||||
location ~* /oauth2 {
|
||||
rewrite api/2.0/(.*) /$1 break;
|
||||
proxy_redirect off;
|
||||
proxy_pass http://127.0.0.1:8080;
|
||||
}
|
||||
}
|
||||
|
||||
location /oauth2/.well-known/openid-configuration {
|
||||
rewrite oauth2/(.*) /$1 break;
|
||||
proxy_pass http://127.0.0.1:8080;
|
||||
}
|
||||
|
||||
location /oauth2 {
|
||||
proxy_pass http://127.0.0.1:8080;
|
||||
}
|
||||
|
||||
location /sso {
|
||||
|
@ -39,7 +39,7 @@ yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/$RPMFUSION
|
||||
|
||||
[ "$REV" = "9" ] && update-crypto-policies --set DEFAULT:SHA1 && ${package_manager} -y install xorg-x11-font-utils
|
||||
[ "$DIST" = "centos" ] && TESTING_REPO="--enablerepo=$( [ "$REV" = "9" ] && echo "crb" || echo "powertools" )"
|
||||
[ "$DIST" = "redhat" ] && /usr/bin/crb enable
|
||||
[ "$DIST" = "redhat" ] && { /usr/bin/crb enable && yum repolist enabled | grep -qi -e crb -e codeready || echo "Failed to enable or verify CRB repository."; exit 1; }
|
||||
|
||||
#add rabbitmq & erlang repo
|
||||
curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash
|
||||
|
@ -71,8 +71,9 @@ read_unsupported_installation () {
|
||||
esac
|
||||
}
|
||||
|
||||
DIST=$(rpm -q --queryformat '%{NAME}' centos-release redhat-release fedora-release | awk -F'[- ]|package' '{print tolower($1)}' | tr -cd '[:alpha:]')
|
||||
[ -z $DIST ] && DIST=$(cat /etc/redhat-release | awk -F 'Linux|release| ' '{print tolower($1)}')
|
||||
DIST=$(rpm -qa --queryformat '%{NAME}\n' | grep -E 'centos-release|redhat-release|fedora-release' | awk -F '-' '{print $1}' | head -n 1)
|
||||
DIST=${DIST:-$(awk -F= '/^ID=/ {gsub(/"/, "", $2); print tolower($2)}' /etc/os-release)};
|
||||
[[ "$DIST" =~ ^(centos|redhat|fedora)$ ]] || DIST="centos"
|
||||
REV=$(sed -n 's/.*release\ \([0-9]*\).*/\1/p' /etc/redhat-release)
|
||||
REV=${REV:-"7"}
|
||||
|
||||
|
@ -13,7 +13,8 @@
|
||||
DOCKERFILE=Dockerfile.app
|
||||
APP_DOTNET_ENV=""
|
||||
EXTERNAL_PORT="80"
|
||||
|
||||
UID="root"
|
||||
GID="root"
|
||||
# opensearch stack #
|
||||
ELK_VERSION=2.11.1
|
||||
ELK_CONTAINER_NAME=${CONTAINER_PREFIX}opensearch
|
||||
@ -101,6 +102,24 @@
|
||||
MANAGEMENT_HOST={CONTAINER_PREFIX}management
|
||||
HELTHCHECKS_HOST=${CONTAINER_PREFIX}healthchecks
|
||||
|
||||
# identity #
|
||||
IDENTITY_DOCKERFILE=/Dockerfile
|
||||
|
||||
JDBC_USER_NAME=root
|
||||
JDBC_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||
JDBC_URL=${MYSQL_CONTAINER_NAME}
|
||||
JDBC_DATABASE=${MYSQL_DATABASE}
|
||||
|
||||
IDENTITY_PROFILE="dev"
|
||||
|
||||
IDENTITY_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity_migration
|
||||
IDENTITY_MIGRATION_SERVER_PORT=8081
|
||||
IDENTITY_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-authorization
|
||||
IDENTITY_AUTHORIZATION_SERVER_PORT=8080
|
||||
IDENTITY_API_CONTAINER_NAME=${CONTAINER_PREFIX}identity-api
|
||||
IDENTITY_API_SERVER_PORT=9090
|
||||
|
||||
REDIS_ADDRESSES=redis://onlyoffice-redis:6379
|
||||
# router upstream environment #
|
||||
SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT}
|
||||
SERVICE_BACKUP=${BACKUP_HOST}:${SERVICE_PORT}
|
||||
@ -121,6 +140,8 @@
|
||||
SERVICE_LOGIN=${LOGIN_HOST}:5011
|
||||
SERVICE_MANAGEMENT={MANAGEMENT_HOST}:${SERVICE_PORT}
|
||||
SERVICE_HELTHCHECKS=${HELTHCHECKS_HOST}:${SERVICE_PORT}
|
||||
SERVICE_IDENTITY_API=${IDENTITY_API_CONTAINER_NAME}:${IDENTITY_API_SERVER_PORT}
|
||||
SERVICE_IDENTITY=${IDENTITY_AUTHORIZATION_CONTAINER_NAME}:${IDENTITY_AUTHORIZATION_SERVER_PORT}
|
||||
|
||||
NETWORK_NAME=${PRODUCT}
|
||||
|
||||
|
@ -176,6 +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: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:9090/$service_identity_api/' /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_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 && \
|
||||
|
@ -52,7 +52,7 @@ RUN cd ${SRC_PATH} && \
|
||||
cd ${SRC_PATH} && \
|
||||
cp buildtools/config/*.config /app/onlyoffice/config/ && \
|
||||
mkdir -p /etc/nginx/conf.d && cp -f buildtools/config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \
|
||||
mkdir -p /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && \
|
||||
mkdir -p /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/server-*.conf /etc/nginx/includes/ && \
|
||||
sed -i "s/\"number\".*,/\"number\": \"${PRODUCT_VERSION}.${BUILD_NUMBER}\",/g" /app/onlyoffice/config/appsettings.json && \
|
||||
sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \
|
||||
cd ${SRC_PATH}/buildtools/install/common/ && \
|
||||
@ -67,7 +67,7 @@ RUN cd ${SRC_PATH} && \
|
||||
rm -rf ${SRC_PATH}/server/products/ASC.Files/Service/* && \
|
||||
rm -rf ${SRC_PATH}/server/products/ASC.People/Server/*
|
||||
|
||||
COPY config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf
|
||||
COPY --chown=onlyoffice:onlyoffice config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf
|
||||
|
||||
FROM $DOTNET_RUN as dotnetrun
|
||||
ARG BUILD_PATH
|
||||
@ -96,7 +96,7 @@ RUN mkdir -p /var/log/onlyoffice && \
|
||||
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/
|
||||
|
||||
#USER onlyoffice
|
||||
USER onlyoffice
|
||||
EXPOSE 5050
|
||||
ENTRYPOINT ["python3", "docker-entrypoint.py"]
|
||||
|
||||
@ -124,7 +124,7 @@ RUN mkdir -p /var/log/onlyoffice && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/
|
||||
|
||||
USER onlyoffice
|
||||
EXPOSE 5050
|
||||
ENTRYPOINT ["python3", "docker-entrypoint.py"]
|
||||
|
||||
@ -139,25 +139,32 @@ ENV DNS_NAMESERVER=127.0.0.11 \
|
||||
|
||||
RUN apt-get -y update && \
|
||||
apt-get install -yq vim && \
|
||||
mkdir -p /var/log/nginx/ && \
|
||||
addgroup --system --gid 107 onlyoffice && \
|
||||
adduser -uid 104 --quiet --home /var/www/onlyoffice --system --gid 107 onlyoffice && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
rm -rf /usr/share/nginx/html/*
|
||||
rm -rf /usr/share/nginx/html/* && \
|
||||
chown -R onlyoffice:onlyoffice /etc/nginx/ && \
|
||||
chown -R onlyoffice:onlyoffice /var/ && \
|
||||
chown -R onlyoffice:onlyoffice /usr/ && \
|
||||
chown -R onlyoffice:onlyoffice /run/ && \
|
||||
chown -R onlyoffice:onlyoffice /var/log/nginx/
|
||||
|
||||
# copy static services files and config values
|
||||
COPY --from=base /etc/nginx/conf.d /etc/nginx/conf.d
|
||||
COPY --from=base /etc/nginx/includes /etc/nginx/includes
|
||||
COPY --from=base ${SRC_PATH}/publish/web/client ${BUILD_PATH}/client
|
||||
COPY --from=base ${SRC_PATH}/publish/web/public ${BUILD_PATH}/public
|
||||
COPY --from=base ${SRC_PATH}/campaigns/src/campaigns ${BUILD_PATH}/public/campaigns
|
||||
COPY --from=base ${SRC_PATH}/publish/web/management ${BUILD_PATH}/management
|
||||
COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/docker-entrypoint.d /docker-entrypoint.d
|
||||
COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template
|
||||
COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template
|
||||
COPY --from=base ${SRC_PATH}/buildtools/config/nginx/html /etc/nginx/html
|
||||
COPY --from=base ${SRC_PATH}/buildtools/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh
|
||||
COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/docker-entrypoint.sh /docker-entrypoint.sh
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /etc/nginx/conf.d /etc/nginx/conf.d
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /etc/nginx/includes /etc/nginx/includes
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/client ${BUILD_PATH}/client
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/public ${BUILD_PATH}/public
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/campaigns/src/campaigns ${BUILD_PATH}/public/campaigns
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/management ${BUILD_PATH}/management
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/config/nginx/docker-entrypoint.d /docker-entrypoint.d
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/config/nginx/html /etc/nginx/html
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/config/nginx/docker-entrypoint.sh /docker-entrypoint.sh
|
||||
|
||||
USER onlyoffice
|
||||
|
||||
# changes for upstream configure
|
||||
RUN sed -i 's/127.0.0.1:5010/$service_api_system/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||
@ -170,10 +177,12 @@ 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: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:9090/$service_identity_api/' /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_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:5601/$dashboards_host:5601/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||
sed -i 's/127.0.0.1:5601/$dashboards_host:5601/' /etc/nginx/includes/server-dashboards.conf && \
|
||||
sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||
sed -i 's/http:\/\/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf && \
|
||||
sed -i '/client_body_temp_path/ i \ \ \ \ $MAP_HASH_BUCKET_SIZE' /etc/nginx/nginx.conf.template && \
|
||||
@ -251,14 +260,14 @@ CMD ["ASC.Files.dll", "ASC.Files"]
|
||||
FROM dotnetrun AS files_services
|
||||
ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
|
||||
WORKDIR ${BUILD_PATH}/products/ASC.Files/service/
|
||||
|
||||
USER root
|
||||
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 871920D1991BC93C && \
|
||||
apt-get -y update && \
|
||||
apt-get install -yq libssl1.1 && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
USER onlyoffice
|
||||
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=onlyoffice/ffvideo:6.0 --chown=onlyoffice:onlyoffice /usr/local /usr/local/
|
||||
@ -344,6 +353,9 @@ ARG BUILD_PATH
|
||||
ARG SRC_PATH
|
||||
ENV BUILD_PATH=${BUILD_PATH}
|
||||
ENV SRC_PATH=${SRC_PATH}
|
||||
RUN addgroup --system --gid 107 onlyoffice && \
|
||||
adduser -uid 104 --quiet --home /var/www/onlyoffice --system --gid 107 onlyoffice
|
||||
USER onlyoffice
|
||||
WORKDIR ${BUILD_PATH}/services/ASC.Migration.Runner/
|
||||
COPY ./docker-migration-entrypoint.sh ./docker-migration-entrypoint.sh
|
||||
COPY --from=base ${SRC_PATH}/server/ASC.Migration.Runner/service/ .
|
||||
@ -356,15 +368,17 @@ RUN mkdir -p /app/ASC.Files/server && \
|
||||
mkdir -p /app/ASC.People/server && \
|
||||
addgroup --system --gid 107 onlyoffice && \
|
||||
adduser -u 104 onlyoffice --home /var/www/onlyoffice --system -G onlyoffice
|
||||
|
||||
COPY bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh
|
||||
COPY --from=base /var/www/products/ASC.Files/server/ /app/ASC.Files/server/
|
||||
COPY --from=base /var/www/products/ASC.People/server/ /app/ASC.People/server/
|
||||
USER onlyoffice
|
||||
COPY --chown=onlyoffice:onlyoffice bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /var/www/products/ASC.Files/server/ /app/ASC.Files/server/
|
||||
COPY --from=base --chown=onlyoffice:onlyoffice /var/www/products/ASC.People/server/ /app/ASC.People/server/
|
||||
ENTRYPOINT ["./app/docker-entrypoint.sh"]
|
||||
|
||||
## image for k8s wait-bin-share ##
|
||||
FROM busybox:latest AS wait_bin_share
|
||||
RUN mkdir /app
|
||||
|
||||
COPY wait-bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh
|
||||
RUN addgroup --system --gid 107 onlyoffice && \
|
||||
adduser -u 104 onlyoffice --home /var/www/onlyoffice --system -G onlyoffice && \
|
||||
mkdir /app
|
||||
USER onlyoffice
|
||||
COPY --chown=onlyoffice:onlyoffice wait-bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh
|
||||
ENTRYPOINT ["./app/docker-entrypoint.sh"]
|
||||
|
@ -122,6 +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: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:9090/$service_identity_api/' /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: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 && \
|
||||
|
@ -5,6 +5,5 @@ echo "##### Run preparation for launching DocSpace services #####"
|
||||
echo "##################################################################"
|
||||
cp -r /app/ASC.Files/server/* /var/www/products/ASC.Files/server/
|
||||
cp -r /app/ASC.People/server/* /var/www/products/ASC.People/server/
|
||||
chown -R onlyoffice:onlyoffice /var/www/products/
|
||||
echo "Ok" > /var/www/products/ASC.Files/server/status.txt
|
||||
echo "Preparation for launching DocSpace services is complete"
|
||||
|
@ -54,6 +54,18 @@ map $SERVICE_API $service_api {
|
||||
default $SERVICE_API;
|
||||
}
|
||||
|
||||
map $SERVICE_IDENTITY_API $service_identity_api {
|
||||
volatile;
|
||||
"" 127.0.0.1:9090;
|
||||
default $SERVICE_IDENTITY_API;
|
||||
}
|
||||
|
||||
map $SERVICE_IDENTITY $service_identity {
|
||||
volatile;
|
||||
"" 127.0.0.1:8080;
|
||||
default $SERVICE_IDENTITY;
|
||||
}
|
||||
|
||||
map $SERVICE_STUDIO $service_studio {
|
||||
volatile;
|
||||
"" 127.0.0.1:5003;
|
||||
|
@ -150,7 +150,12 @@ services:
|
||||
<<: *x-profiles-local
|
||||
image: ${Baseimage_Dotnet_Run}
|
||||
working_dir: ${BUILD_PATH}/studio/ASC.Web.Studio/
|
||||
command: ["ASC.Web.Studio.dll", "ASC.Web.Studio"]
|
||||
command:
|
||||
[
|
||||
"ASC.Web.Studio.dll",
|
||||
"ASC.Web.Studio",
|
||||
"core:eventBus:subscriptionClientName=asc_event_bus_webstudio_queue",
|
||||
]
|
||||
volumes:
|
||||
- ${SRC_PATH}/ASC.Web.Studio/service:${BUILD_PATH}/studio/ASC.Web.Studio/
|
||||
- ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/
|
||||
|
@ -264,6 +264,8 @@ services:
|
||||
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
||||
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
||||
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
||||
- SERVICE_IDENTITY_API=${SERVICE_IDENTITY_API}
|
||||
- SERVICE_IDENTITY=${SERVICE_IDENTITY}
|
||||
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
||||
- SERVICE_API=${SERVICE_API}
|
||||
- SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
|
||||
|
@ -1,5 +1,5 @@
|
||||
x-healthcheck:
|
||||
&x-healthcheck
|
||||
version: "3.8"
|
||||
x-healthcheck: &x-healthcheck
|
||||
test: curl --fail http://127.0.0.1 || exit 1
|
||||
interval: 60s
|
||||
retries: 5
|
||||
@ -8,6 +8,7 @@ x-healthcheck:
|
||||
|
||||
x-service: &x-service-base
|
||||
container_name: base
|
||||
user: "${UID}:${GID}"
|
||||
restart: always
|
||||
expose:
|
||||
- ${SERVICE_PORT}
|
||||
@ -177,6 +178,7 @@ services:
|
||||
onlyoffice-router:
|
||||
image: "${REPO}/${DOCKER_IMAGE_PREFIX}-router:${DOCKER_TAG}"
|
||||
container_name: ${ROUTER_HOST}
|
||||
user: "${UID}:${GID}"
|
||||
restart: always
|
||||
healthcheck:
|
||||
<<: *x-healthcheck
|
||||
@ -208,6 +210,8 @@ services:
|
||||
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
|
||||
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
|
||||
- SERVICE_SOCKET=${SERVICE_SOCKET}
|
||||
- SERVICE_IDENTITY_API=${SERVICE_IDENTITY_API}
|
||||
- SERVICE_IDENTITY=${SERVICE_IDENTITY}
|
||||
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
|
||||
- SERVICE_API=${SERVICE_API}
|
||||
- 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
|
12
run/IdentityApi.xml
Normal file
12
run/IdentityApi.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<service>
|
||||
<id>OnlyofficeIdentityApi</id>
|
||||
<name>ONLYOFFICE IdentityApi</name>
|
||||
<startmode>manual</startmode>
|
||||
<executable>java</executable>
|
||||
<env name="LOG_FILE_PATH" value="../../Logs/identity-api.log"/>
|
||||
<env name="SPRING_PROFILES_ACTIVE" value=""/>
|
||||
<arguments>-jar ../../server/common/ASC.Identity/registration/registration-container/target/registration-container-1.0.0.jar</arguments>
|
||||
<log mode="none"/>
|
||||
<delayedAutoStart>true</delayedAutoStart>
|
||||
<onfailure action="restart" delay="5 sec" />
|
||||
</service>
|
12
run/IdentityMigration.xml
Normal file
12
run/IdentityMigration.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<service>
|
||||
<id>OnlyofficeIdentityMigration</id>
|
||||
<name>ONLYOFFICE IdentityMigration</name>
|
||||
<startmode>manual</startmode>
|
||||
<executable>java</executable>
|
||||
<env name="LOG_FILE_PATH" value="../../Logs/identity-migration.log"/>
|
||||
<env name="SPRING_PROFILES_ACTIVE" value="dev"/>
|
||||
<arguments>-jar ../../server/common/ASC.Identity/infrastructure/infrastructure-migration-runner/target/infrastructure-migration-runner-1.0.0.jar</arguments>
|
||||
<log mode="none"/>
|
||||
<delayedAutoStart>true</delayedAutoStart>
|
||||
<onfailure action="restart" delay="5 sec" />
|
||||
</service>
|
13
run/IdentityService.xml
Normal file
13
run/IdentityService.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<service>
|
||||
<id>OnlyofficeIdentityService</id>
|
||||
<name>ONLYOFFICE IdentityService</name>
|
||||
<startmode>manual</startmode>
|
||||
<executable>java</executable>
|
||||
<env name="LOG_FILE_PATH" value="../../Logs/identity-authorization.log"/>
|
||||
<env name="SERVER_PORT" value="8080"/>
|
||||
<env name="SPRING_PROFILES_ACTIVE" value=""/>
|
||||
<arguments>-jar ../../server/common/ASC.Identity/authorization/authorization-container/target/authorization-container-1.0.0.jar</arguments>
|
||||
<log mode="none"/>
|
||||
<delayedAutoStart>true</delayedAutoStart>
|
||||
<onfailure action="restart" delay="5 sec" />
|
||||
</service>
|
28
scripts/identity.bat
Normal file
28
scripts/identity.bat
Normal file
@ -0,0 +1,28 @@
|
||||
PUSHD %~dp0..
|
||||
|
||||
cd %~dp0../../server/common/ASC.Identity/
|
||||
|
||||
echo Start build ASC.Identity project...
|
||||
echo.
|
||||
|
||||
echo ASC.Identity: resolves all project dependencies...
|
||||
echo.
|
||||
|
||||
call mvn dependency:go-offline -q
|
||||
|
||||
if %errorlevel% == 0 (
|
||||
|
||||
echo ASC.Identity: take the compiled code and package it in its distributable format, such as a JAR...
|
||||
call mvn package -DskipTests -q
|
||||
|
||||
)
|
||||
|
||||
if %errorlevel% == 0 (
|
||||
|
||||
echo ASC.Identity: build completed
|
||||
echo.
|
||||
|
||||
)
|
||||
|
||||
|
||||
POPD
|
Loading…
Reference in New Issue
Block a user