Skip to content

Commit

Permalink
Merge pull request #127 from ONLYOFFICE/release/11.5.0
Browse files Browse the repository at this point in the history
Merge release/11.5.0 into master
  • Loading branch information
agolybev authored Aug 25, 2021
2 parents dc30b2c + 38899cb commit 9404fb3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN apt-get -y update && \
jq \
openjdk-8-jre-headless \
apt-transport-https \
elasticsearch=7.4.0 \
elasticsearch=7.9.0 \
mono-webserver-hyperfastcgi=0.4-7 \
${PACKAGE_SYSNAME}-communityserver \
${PACKAGE_SYSNAME}-xmppserver && \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfile.alc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM onlyoffice4ami/communityserver:latest
ARG APPSETTING_CONFIG=/var/www/onlyoffice/WebStudio/web.appsettings.config

RUN xmlstarlet ed -L \
-s "/appSettings" -t elem -n "add" \
-i "/appSettings/add[not(@*)]" -t attr -n "key" -v "web.ami.meta" \
-i "/appSettings/add[@key='web.ami.meta']" -t attr -n "value" -v "http://100.100.100.200/latest/meta-data/" \
$APPSETTING_CONFIG
8 changes: 7 additions & 1 deletion run-community-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ echo "##########################################################"
SERVER_HOST=${SERVER_HOST:-""};
APP_DIR="/var/www/onlyoffice"
APP_DATA_DIR="${APP_DIR}/Data"
APP_INDEX_DIR="${APP_DATA_DIR}/Index/v7.4.0"
APP_INDEX_DIR="${APP_DATA_DIR}/Index/v7.9.0"
APP_PRIVATE_DATA_DIR="${APP_DATA_DIR}/.private"
APP_SERVICES_DIR="${APP_DIR}/Services"
APP_SQL_DIR="${APP_DIR}/Sql"
Expand Down Expand Up @@ -1201,6 +1201,12 @@ if [ -n "$PID" ]; then
kill -9 $PID
fi

# clear nginx & mono cache
rm -dfr /tmp/onlyoffice* || true
rm -dfr /var/run/onlyoffice/* || true
rm -dfr /var/cache/nginx/onlyoffice/* || true


if [ "${DOCKER_ENABLED}" == "true" ]; then
exec /lib/systemd/systemd
fi

0 comments on commit 9404fb3

Please sign in to comment.