Merge pull request #133 from ONLYOFFICE/release/11.5.0
Merge release/11.5.0 into master
This commit is contained in:
commit
e0e95c2eba
|
@ -1,8 +0,0 @@
|
|||
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
|
|
@ -1,4 +1,4 @@
|
|||
FROM onlyoffice/communityserver:latest
|
||||
FROM onlyoffice/communityserver:latest AS communityserver-ami
|
||||
ARG APPSETTING_CONFIG=/var/www/onlyoffice/WebStudio/web.appsettings.config
|
||||
|
||||
RUN apt-get -y update && \
|
||||
|
@ -26,3 +26,13 @@ RUN xmlstarlet ed -L \
|
|||
-i "/appSettings/add[not(@*)]" -t attr -n "key" -v "web.hide-settings" \
|
||||
-i "/appSettings/add[@key='web.hide-settings']" -t attr -n "value" -v "VersionSettings,Monitoring,PublicPortal,PortalRename,Migration,Promocode,TariffSettings,ProxyHttpContent,MailService,FullTextSearch,Storage,EncryptionSettings" \
|
||||
$APPSETTING_CONFIG
|
||||
|
||||
FROM communityserver-ami AS communityserver-alc
|
||||
ARG APPSETTING_CONFIG=/var/www/onlyoffice/WebStudio/web.appsettings.config
|
||||
|
||||
RUN xmlstarlet ed -L \
|
||||
-d "/appSettings/add[@key='web.ami.meta']" \
|
||||
-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
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
version: "3.6"
|
||||
|
||||
services:
|
||||
onlyoffice-communityserver-ami:
|
||||
build:
|
||||
context: ./
|
||||
dockerfile: Dockerfile.ami
|
||||
target: communityserver-ami
|
||||
image: "${REPO}/${STATUS}communityserver:${TAG}"
|
||||
|
||||
onlyoffice-communityserver-alc:
|
||||
build:
|
||||
context: ./
|
||||
dockerfile: Dockerfile.ami
|
||||
target: communityserver-alc
|
||||
image: "${REPO}/${STATUS}communityserver:${TAG}-alc"
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash
|
||||
export TAG=$DOCKER_TAG
|
||||
docker-compose -f ${BUILD_FILE}.yml build
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash
|
||||
export TAG=$DOCKER_TAG
|
||||
docker-compose -f ${BUILD_FILE}.yml push
|
Loading…
Reference in New Issue