Skip to content

Commit

Permalink
Merge pull request #133 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 Sep 6, 2021
2 parents 9404fb3 + 0e21913 commit e0e95c2
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
REPO=onlyoffice4ami
STATUS=''
TAG=latest
8 changes: 0 additions & 8 deletions Dockerfile.alc

This file was deleted.

12 changes: 11 additions & 1 deletion Dockerfile.ami
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down Expand Up @@ -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
16 changes: 16 additions & 0 deletions build.yml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions hooks/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
export TAG=$DOCKER_TAG
docker-compose -f ${BUILD_FILE}.yml build
3 changes: 3 additions & 0 deletions hooks/push
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
export TAG=$DOCKER_TAG
docker-compose -f ${BUILD_FILE}.yml push

0 comments on commit e0e95c2

Please sign in to comment.