Compare commits
3 commits
master
...
feature/up
Author | SHA1 | Date | |
---|---|---|---|
2d665f7957 | |||
a7334483d0 | |||
b1239047d2 |
139
.github/workflows/4testing-build.yml
vendored
139
.github/workflows/4testing-build.yml
vendored
|
@ -1,139 +0,0 @@
|
||||||
### This workflow setup instance then build and push images ###
|
|
||||||
name: 4testing multiarch-build
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
build:
|
|
||||||
description: 'Build number (ex. 45)'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
amd64:
|
|
||||||
type: boolean
|
|
||||||
description: 'Build AMD64'
|
|
||||||
default: true
|
|
||||||
arm64:
|
|
||||||
type: boolean
|
|
||||||
description: 'Build ARM64'
|
|
||||||
default: true
|
|
||||||
community:
|
|
||||||
type: boolean
|
|
||||||
description: 'Build Community Edition'
|
|
||||||
default: true
|
|
||||||
enterprise:
|
|
||||||
type: boolean
|
|
||||||
description: 'Build Enterprise Edition'
|
|
||||||
default: true
|
|
||||||
developer:
|
|
||||||
type: boolean
|
|
||||||
description: 'Build Developer Edition'
|
|
||||||
default: true
|
|
||||||
|
|
||||||
env:
|
|
||||||
COMPANY_NAME: "onlyoffice"
|
|
||||||
PRODUCT_NAME: "documentserver"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
prepare:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- id: matrix
|
|
||||||
run: |
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
BRANCH_NAME=${GITHUB_REF#refs/heads/}
|
|
||||||
if ! [[ $BRANCH_NAME == develop || $BRANCH_NAME =~ hotfix || $BRANCH_NAME =~ release ]]; then
|
|
||||||
echo "Wrong branch."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ ${{ github.event.inputs.amd64 }} = true ] && PLATFORMS+=("amd64")
|
|
||||||
[ ${{ github.event.inputs.arm64 }} = true ] && PLATFORMS+=("arm64")
|
|
||||||
if [ -z ${PLATFORMS} ]; then
|
|
||||||
echo "None of the platforms are selected."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ ${{ github.event.inputs.community }} = true ] && EDITIONS+=("community")
|
|
||||||
[ ${{ github.event.inputs.enterprise }} = true ] && EDITIONS+=("enterprise")
|
|
||||||
[ ${{ github.event.inputs.developer }} = true ] && EDITIONS+=("developer")
|
|
||||||
if [ -z ${EDITIONS} ]; then
|
|
||||||
echo "None of the editions are selected."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "::set-output name=editions::$(jq -n -c --arg s "${EDITIONS[*]}" '($s|split(" "))')"
|
|
||||||
outputs:
|
|
||||||
editions: ${{ steps.matrix.outputs.editions }}
|
|
||||||
|
|
||||||
build:
|
|
||||||
name: "Build ${{ matrix.image }}-${{ matrix.edition }}"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: prepare
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
image: ["documentserver"]
|
|
||||||
edition: ${{ fromJSON(needs.prepare.outputs.editions) }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
id: buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build 4testing
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
|
|
||||||
### ==>> At this step build variable declaration ###
|
|
||||||
|
|
||||||
case ${{ matrix.edition }} in
|
|
||||||
community)
|
|
||||||
PRODUCT_EDITION=""
|
|
||||||
;;
|
|
||||||
enterprise)
|
|
||||||
PRODUCT_EDITION="-ee"
|
|
||||||
;;
|
|
||||||
developer)
|
|
||||||
PRODUCT_EDITION="-de"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
[ ${{ github.event.inputs.amd64 }} = true ] && PLATFORMS+=("amd64")
|
|
||||||
[ ${{ github.event.inputs.arm64 }} = true ] && PLATFORMS+=("arm64")
|
|
||||||
PLATFORM=$(echo ${PLATFORMS[*]/#/linux/} | tr ' ' ',')
|
|
||||||
|
|
||||||
BRANCH_NAME=${GITHUB_REF#refs/heads/}
|
|
||||||
if [ $BRANCH_NAME = develop ]; then
|
|
||||||
RELEASE_BRANCH=unstable
|
|
||||||
PRODUCT_VERSION=99.99.99
|
|
||||||
elif [[ $BRANCH_NAME =~ hotfix || $BRANCH_NAME =~ release ]]; then
|
|
||||||
RELEASE_BRANCH=testing
|
|
||||||
PRODUCT_VERSION=${BRANCH_NAME#*/v}
|
|
||||||
fi
|
|
||||||
BUILD_NUMBER=${{ github.event.inputs.build }}
|
|
||||||
|
|
||||||
export PRODUCT_EDITION
|
|
||||||
export PACKAGE_VERSION=${PRODUCT_VERSION}-${BUILD_NUMBER}
|
|
||||||
export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL_OLD }}/${RELEASE_BRANCH}/ubuntu
|
|
||||||
export RELEASE_BRANCH
|
|
||||||
export PLATFORM
|
|
||||||
export DOCKERFILE=Dockerfile
|
|
||||||
export PREFIX_NAME=4testing-
|
|
||||||
export TAG=${PRODUCT_VERSION}.${BUILD_NUMBER}
|
|
||||||
|
|
||||||
### ==>> Build and push images at this step ###
|
|
||||||
|
|
||||||
docker buildx bake -f docker-bake.hcl ${{ matrix.image }} --push
|
|
||||||
echo "DONE: Build success"
|
|
||||||
shell: bash
|
|
130
.github/workflows/stable-build.yml
vendored
130
.github/workflows/stable-build.yml
vendored
|
@ -1,130 +0,0 @@
|
||||||
### This workflow setup instance then build and push images ###
|
|
||||||
name: Multi-arch build stable
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
tag:
|
|
||||||
description: 'Tag for release (ex. 1.2.3.45)'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
|
|
||||||
env:
|
|
||||||
COMPANY_NAME: "onlyoffice"
|
|
||||||
PRODUCT_NAME: "documentserver"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: "Release image: DocumentServer${{ matrix.edition }}"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
images: ["documentserver-stable"]
|
|
||||||
edition: ["", "-ee", "-de"]
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build documentserver-release
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
VERSION=${{ github.event.inputs.tag }}
|
|
||||||
PRODUCT_EDITION=${{ matrix.edition }}
|
|
||||||
TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION}
|
|
||||||
if docker manifest inspect ${TESTING_IMAGE}:${VERSION} > /dev/null; then
|
|
||||||
echo "Image present on docker.hub >> start build stable version"
|
|
||||||
export PRODUCT_EDITION
|
|
||||||
export TAG=${VERSION}
|
|
||||||
export SHORTER_TAG=${VERSION%.*}
|
|
||||||
export SHORTEST_TAG=${VERSION%.*.*}
|
|
||||||
docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
|
|
||||||
echo "DONE: Build success >> exit with 0"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
echo "FAILED: Image with tag ${VERSION} do not presented on docker.hub >> build will not started >> exit with 1"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
build-nonexample:
|
|
||||||
name: "Release image: DocumentServer${{ matrix.edition }}-nonExample"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: [build]
|
|
||||||
if: ${{ false }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
images: ["documentserver-nonexample"]
|
|
||||||
edition: ["", "-ee", "-de"]
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: build image
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
export PRODUCT_EDITION=${{ matrix.edition }}
|
|
||||||
export TAG=${{ github.event.inputs.tag }}
|
|
||||||
docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
build-ucs-ubuntu20:
|
|
||||||
name: "Release image: DocumentServer${{ matrix.edition }}-ucs"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
edition: ["", "-ee"]
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v2
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: build UCS
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
export PRODUCT_EDITION=${{ matrix.edition }}
|
|
||||||
export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL_OLD }}/testing/ubuntu
|
|
||||||
export DOCKERFILE=Dockerfile
|
|
||||||
export BASE_IMAGE=ubuntu:20.04
|
|
||||||
export PG_VERSION=12
|
|
||||||
export TAG=${{ github.event.inputs.tag }}
|
|
||||||
export PACKAGE_VERSION=$( echo ${TAG} | sed -E 's/(.*)\./\1-/')
|
|
||||||
docker buildx bake -f docker-bake.hcl documentserver-ucs --push
|
|
||||||
shell: bash
|
|
33
Dockerfile
33
Dockerfile
|
@ -1,24 +1,16 @@
|
||||||
ARG BASE_IMAGE=ubuntu:22.04
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
FROM ${BASE_IMAGE} as documentserver
|
|
||||||
LABEL maintainer Ascensio System SIA <support@onlyoffice.com>
|
LABEL maintainer Ascensio System SIA <support@onlyoffice.com>
|
||||||
|
|
||||||
ARG PG_VERSION=14
|
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=12
|
||||||
|
|
||||||
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive PG_VERSION=${PG_VERSION}
|
|
||||||
|
|
||||||
ARG ONLYOFFICE_VALUE=onlyoffice
|
ARG ONLYOFFICE_VALUE=onlyoffice
|
||||||
|
|
||||||
RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
|
RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get -yq install wget apt-transport-https gnupg locales lsb-release && \
|
apt-get -yq install wget apt-transport-https gnupg locales && \
|
||||||
mkdir -p $HOME/.gnupg && \
|
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \
|
||||||
gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/onlyoffice.gpg --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \
|
|
||||||
chmod 644 /etc/apt/trusted.gpg.d/onlyoffice.gpg && \
|
|
||||||
locale-gen en_US.UTF-8 && \
|
locale-gen en_US.UTF-8 && \
|
||||||
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
||||||
wget -O - https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.deb.sh | bash && \
|
|
||||||
if [ $(lsb_release -cs) = focal ]; then RABBITMQ_VERSION=3.8.11-1; else RABBITMQ_VERSION=3.10 ; fi && \
|
|
||||||
apt-get -yq install \
|
apt-get -yq install \
|
||||||
adduser \
|
adduser \
|
||||||
apt-utils \
|
apt-utils \
|
||||||
|
@ -47,7 +39,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
|
||||||
postgresql \
|
postgresql \
|
||||||
postgresql-client \
|
postgresql-client \
|
||||||
pwgen \
|
pwgen \
|
||||||
rabbitmq-server=${RABBITMQ_VERSION}* \
|
rabbitmq-server \
|
||||||
redis-server \
|
redis-server \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
sudo \
|
sudo \
|
||||||
|
@ -79,24 +71,19 @@ EXPOSE 80 443
|
||||||
|
|
||||||
ARG COMPANY_NAME=onlyoffice
|
ARG COMPANY_NAME=onlyoffice
|
||||||
ARG PRODUCT_NAME=documentserver
|
ARG PRODUCT_NAME=documentserver
|
||||||
ARG PRODUCT_EDITION=
|
ARG PACKAGE_URL="http://download.onlyoffice.com/install/documentserver/linux/${COMPANY_NAME}-${PRODUCT_NAME}_amd64.deb"
|
||||||
ARG PACKAGE_VERSION=
|
|
||||||
ARG TARGETARCH
|
|
||||||
ARG PACKAGE_BASEURL="http://download.onlyoffice.com/install/documentserver/linux"
|
|
||||||
|
|
||||||
ENV COMPANY_NAME=$COMPANY_NAME \
|
ENV COMPANY_NAME=$COMPANY_NAME \
|
||||||
PRODUCT_NAME=$PRODUCT_NAME \
|
PRODUCT_NAME=$PRODUCT_NAME
|
||||||
PRODUCT_EDITION=$PRODUCT_EDITION
|
|
||||||
|
|
||||||
RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" && \
|
RUN wget -q -P /tmp "$PACKAGE_URL" && \
|
||||||
wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE" && \
|
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
service postgresql start && \
|
service postgresql start && \
|
||||||
apt-get -yq install /tmp/$PACKAGE_FILE && \
|
apt-get -yq install /tmp/$(basename "$PACKAGE_URL") && \
|
||||||
service postgresql stop && \
|
service postgresql stop && \
|
||||||
service supervisor stop && \
|
service supervisor stop && \
|
||||||
chmod 755 /app/ds/*.sh && \
|
chmod 755 /app/ds/*.sh && \
|
||||||
rm -f /tmp/$PACKAGE_FILE && \
|
rm -f /tmp/$(basename "$PACKAGE_URL") && \
|
||||||
rm -rf /var/log/$COMPANY_NAME && \
|
rm -rf /var/log/$COMPANY_NAME && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
66
Makefile
66
Makefile
|
@ -1,7 +1,6 @@
|
||||||
COMPANY_NAME ?= ONLYOFFICE
|
COMPANY_NAME ?= ONLYOFFICE
|
||||||
GIT_BRANCH ?= develop
|
GIT_BRANCH ?= develop
|
||||||
PRODUCT_NAME ?= DocumentServer
|
PRODUCT_NAME ?= DocumentServer
|
||||||
PRODUCT_EDITION ?=
|
|
||||||
PRODUCT_VERSION ?= 0.0.0
|
PRODUCT_VERSION ?= 0.0.0
|
||||||
BUILD_NUMBER ?= 0
|
BUILD_NUMBER ?= 0
|
||||||
ONLYOFFICE_VALUE ?= onlyoffice
|
ONLYOFFICE_VALUE ?= onlyoffice
|
||||||
|
@ -12,61 +11,64 @@ COMPANY_NAME_LOW = $(shell echo $(COMPANY_NAME) | tr A-Z a-z)
|
||||||
PRODUCT_NAME_LOW = $(shell echo $(PRODUCT_NAME) | tr A-Z a-z)
|
PRODUCT_NAME_LOW = $(shell echo $(PRODUCT_NAME) | tr A-Z a-z)
|
||||||
COMPANY_NAME_LOW_ESCAPED = $(subst -,,$(COMPANY_NAME_LOW))
|
COMPANY_NAME_LOW_ESCAPED = $(subst -,,$(COMPANY_NAME_LOW))
|
||||||
|
|
||||||
PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)$(PRODUCT_EDITION)
|
PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
|
||||||
PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
|
PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
|
||||||
PACKAGE_BASEURL := https://s3.eu-west-1.amazonaws.com/$(S3_BUCKET)/$(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/ubuntu
|
PACKAGE_URL := http://$(S3_BUCKET).s3.amazonaws.com/$(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/ubuntu/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_amd64.deb
|
||||||
|
|
||||||
ifeq ($(RELEASE_BRANCH),$(filter $(RELEASE_BRANCH),unstable testing))
|
UPDATE_LATEST := false
|
||||||
DOCKER_TAG := $(subst -,.,$(PACKAGE_VERSION))
|
|
||||||
|
ifneq (,$(findstring develop,$(GIT_BRANCH)))
|
||||||
|
DOCKER_TAG += $(subst -,.,$(PACKAGE_VERSION))
|
||||||
|
DOCKER_TAGS += latest
|
||||||
|
else ifneq (,$(findstring release,$(GIT_BRANCH)))
|
||||||
|
DOCKER_TAG += $(subst -,.,$(PACKAGE_VERSION))
|
||||||
|
else ifneq (,$(findstring hotfix,$(GIT_BRANCH)))
|
||||||
|
DOCKER_TAG += $(subst -,.,$(PACKAGE_VERSION))
|
||||||
else
|
else
|
||||||
DOCKER_TAG := $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH))
|
DOCKER_TAG += $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DOCKER_IMAGE := $(subst -,,$(COMPANY_NAME_LOW))/4testing-$(PRODUCT_NAME_LOW)$(PRODUCT_EDITION)
|
DOCKER_TAGS += $(DOCKER_TAG)
|
||||||
DOCKER_DUMMY := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)$(PRODUCT_EDITION)__$(DOCKER_TAG).dummy
|
|
||||||
|
DOCKER_REPO = $(COMPANY_NAME_LOW_ESCAPED)/4testing-$(PRODUCT_NAME_LOW)
|
||||||
|
|
||||||
|
COLON := __colon__
|
||||||
|
DOCKER_TARGETS := $(foreach TAG,$(DOCKER_TAGS),$(DOCKER_REPO)$(COLON)$(TAG))
|
||||||
|
|
||||||
DOCKER_ARCH := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)_$(PACKAGE_VERSION).tar.gz
|
DOCKER_ARCH := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)_$(PACKAGE_VERSION).tar.gz
|
||||||
|
|
||||||
DOCKER_ARCH_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/docker/$(notdir $(DOCKER_ARCH))
|
DOCKER_ARCH_URI := $(COMPANY_NAME_LOW)/$(RELEASE_BRANCH)/docker/$(notdir $(DOCKER_ARCH))
|
||||||
|
|
||||||
.PHONY: all clean clean-docker image deploy docker publish
|
.PHONY: all clean clean-docker deploy docker publish
|
||||||
|
|
||||||
|
$(DOCKER_TARGETS): $(DEB_REPO_DATA)
|
||||||
|
|
||||||
$(DOCKER_DUMMY):
|
|
||||||
docker pull ubuntu:20.04
|
|
||||||
docker build \
|
docker build \
|
||||||
|
--build-arg PACKAGE_URL=$(PACKAGE_URL) \
|
||||||
--build-arg COMPANY_NAME=$(COMPANY_NAME_LOW) \
|
--build-arg COMPANY_NAME=$(COMPANY_NAME_LOW) \
|
||||||
--build-arg PRODUCT_NAME=$(PRODUCT_NAME_LOW) \
|
--build-arg PRODUCT_NAME=$(PRODUCT_NAME_LOW) \
|
||||||
--build-arg PRODUCT_EDITION=$(PRODUCT_EDITION) \
|
|
||||||
--build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \
|
|
||||||
--build-arg PACKAGE_BASEURL=$(PACKAGE_BASEURL) \
|
|
||||||
--build-arg TARGETARCH=amd64 \
|
|
||||||
--build-arg ONLYOFFICE_VALUE=$(ONLYOFFICE_VALUE) \
|
--build-arg ONLYOFFICE_VALUE=$(ONLYOFFICE_VALUE) \
|
||||||
-t $(DOCKER_IMAGE):$(DOCKER_TAG) . && \
|
-t $(subst $(COLON),:,$@) . &&\
|
||||||
mkdir -p $$(dirname $@) && \
|
mkdir -p $$(dirname $@) &&\
|
||||||
echo "Done" > $@
|
echo "Done" > $@
|
||||||
|
|
||||||
$(DOCKER_ARCH): $(DOCKER_DUMMY)
|
$(DOCKER_ARCH): $(DOCKER_TARGETS)
|
||||||
docker save $(DOCKER_IMAGE):$(DOCKER_TAG) | \
|
docker save $(DOCKER_REPO):$(DOCKER_TAG) | \
|
||||||
gzip > $@
|
gzip > $@
|
||||||
|
|
||||||
all: image
|
all: $(DOCKER_TARGETS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rfv *.dummy *.tar.gz
|
rm -rfv $(DOCKER_TARGETS) $(DOCKER_ARCH)
|
||||||
|
|
||||||
clean-docker:
|
clean-docker:
|
||||||
docker rmi -f $$(docker images -q $(COMPANY_NAME_LOW)/*) || exit 0
|
docker rmi -f $$(docker images -q $(COMPANY_NAME_LOW)/*) || exit 0
|
||||||
|
|
||||||
image: $(DOCKER_DUMMY)
|
deploy: $(DOCKER_TARGETS)
|
||||||
|
$(foreach TARGET,$(DOCKER_TARGETS), \
|
||||||
deploy: $(DOCKER_DUMMY)
|
|
||||||
for i in {1..3}; do \
|
for i in {1..3}; do \
|
||||||
docker push $(DOCKER_IMAGE):$(DOCKER_TAG) && break || sleep 1m; \
|
docker push $(subst $(COLON),:,$(TARGET)) && break || sleep 1m; \
|
||||||
done
|
done;)
|
||||||
ifeq ($(RELEASE_BRANCH),unstable)
|
|
||||||
docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest
|
|
||||||
for i in {1..3}; do \
|
|
||||||
docker push $(DOCKER_IMAGE):latest && break || sleep 1m; \
|
|
||||||
done
|
|
||||||
endif
|
|
||||||
|
|
||||||
publish: $(DOCKER_ARCH)
|
publish: $(DOCKER_ARCH)
|
||||||
aws s3 cp --no-progress --acl public-read \
|
aws s3 cp --no-progress --acl public-read \
|
||||||
|
|
21
README.md
21
README.md
|
@ -25,8 +25,6 @@ Starting from version 6.0, Document Server is distributed as ONLYOFFICE Docs. It
|
||||||
|
|
||||||
ONLYOFFICE Docs can be used as a part of ONLYOFFICE Workspace or with third-party sync&share solutions (e.g. Nextcloud, ownCloud, Seafile) to enable collaborative editing within their interface.
|
ONLYOFFICE Docs can be used as a part of ONLYOFFICE Workspace or with third-party sync&share solutions (e.g. Nextcloud, ownCloud, Seafile) to enable collaborative editing within their interface.
|
||||||
|
|
||||||
***Important*** Please update `docker-enginge` to latest version (`20.10.21` as of writing this doc) before using it. We use `ubuntu:22.04` as base image and it older versions of docker have compatibility problems with it
|
|
||||||
|
|
||||||
## Functionality ##
|
## Functionality ##
|
||||||
* ONLYOFFICE Document Editor
|
* ONLYOFFICE Document Editor
|
||||||
* ONLYOFFICE Spreadsheet Editor
|
* ONLYOFFICE Spreadsheet Editor
|
||||||
|
@ -109,7 +107,7 @@ When using CA certified certificates (e.g [Let's encrypt](https://letsencrypt.or
|
||||||
|
|
||||||
#### Using the automatically generated Let's Encrypt SSL Certificates
|
#### Using the automatically generated Let's Encrypt SSL Certificates
|
||||||
|
|
||||||
sudo docker run -i -t -d -p 80:80 -p 443:443 \
|
sudo docker run -i -t -d -p 443:443 \
|
||||||
-e LETS_ENCRYPT_DOMAIN=your_domain -e LETS_ENCRYPT_MAIL=your_mail onlyoffice/documentserver
|
-e LETS_ENCRYPT_DOMAIN=your_domain -e LETS_ENCRYPT_MAIL=your_mail onlyoffice/documentserver
|
||||||
|
|
||||||
If you want to get and extend Let's Encrypt SSL Certificates automatically just set LETS_ENCRYPT_DOMAIN and LETS_ENCRYPT_MAIL variables.
|
If you want to get and extend Let's Encrypt SSL Certificates automatically just set LETS_ENCRYPT_DOMAIN and LETS_ENCRYPT_MAIL variables.
|
||||||
|
@ -180,22 +178,19 @@ Below is the complete list of parameters that can be set using environment varia
|
||||||
- **DB_TYPE**: The database type. Supported values are `postgres`, `mariadb` or `mysql`. Defaults to `postgres`.
|
- **DB_TYPE**: The database type. Supported values are `postgres`, `mariadb` or `mysql`. Defaults to `postgres`.
|
||||||
- **DB_HOST**: The IP address or the name of the host where the database server is running.
|
- **DB_HOST**: The IP address or the name of the host where the database server is running.
|
||||||
- **DB_PORT**: The database server port number.
|
- **DB_PORT**: The database server port number.
|
||||||
- **DB_NAME**: The name of a database to use. Should be existing on container startup.
|
- **DB_NAME**: The name of a database to be created on the image startup.
|
||||||
- **DB_USER**: The new user name with superuser permissions for the database account.
|
- **DB_USER**: The new user name with superuser permissions for the database account.
|
||||||
- **DB_PWD**: The password set for the database account.
|
- **DB_PWD**: The password set for the database account.
|
||||||
- **AMQP_URI**: The [AMQP URI](https://www.rabbitmq.com/uri-spec.html "RabbitMQ URI Specification") to connect to message broker server.
|
- **AMQP_URI**: The [AMQP URI](https://www.rabbitmq.com/uri-spec.html "RabbitMQ URI Specification") to connect to message broker server.
|
||||||
- **AMQP_TYPE**: The message broker type. Supported values are `rabbitmq` or `activemq`. Defaults to `rabbitmq`.
|
- **AMQP_TYPE**: The message broker type. Supported values are `rabbitmq` or `activemq`. Defaults to `rabbitmq`.
|
||||||
- **REDIS_SERVER_HOST**: The IP address or the name of the host where the Redis server is running.
|
- **REDIS_SERVER_HOST**: The IP address or the name of the host where the Redis server is running.
|
||||||
- **REDIS_SERVER_PORT**: The Redis server port number.
|
- **REDIS_SERVER_PORT**: The Redis server port number.
|
||||||
- **REDIS_SERVER_PASS**: The Redis server password. The password is not set by default.
|
|
||||||
- **NGINX_WORKER_PROCESSES**: Defines the number of nginx worker processes.
|
- **NGINX_WORKER_PROCESSES**: Defines the number of nginx worker processes.
|
||||||
- **NGINX_WORKER_CONNECTIONS**: Sets the maximum number of simultaneous connections that can be opened by a nginx worker process.
|
- **NGINX_WORKER_CONNECTIONS**: Sets the maximum number of simultaneous connections that can be opened by a nginx worker process.
|
||||||
- **SECURE_LINK_SECRET**: Defines secret for the nginx config directive [secure_link_md5](http://nginx.org/ru/docs/http/ngx_http_secure_link_module.html#secure_link_md5). Defaults to `random string`.
|
- **JWT_ENABLED**: Specifies the enabling the JSON Web Token validation by the ONLYOFFICE Document Server. Defaults to `false`.
|
||||||
- **JWT_ENABLED**: Specifies the enabling the JSON Web Token validation by the ONLYOFFICE Document Server. Defaults to `true`.
|
- **JWT_SECRET**: Defines the secret key to validate the JSON Web Token in the request to the ONLYOFFICE Document Server. Defaults to `secret`.
|
||||||
- **JWT_SECRET**: Defines the secret key to validate the JSON Web Token in the request to the ONLYOFFICE Document Server. Defaults to random value.
|
|
||||||
- **JWT_HEADER**: Defines the http header that will be used to send the JSON Web Token. Defaults to `Authorization`.
|
- **JWT_HEADER**: Defines the http header that will be used to send the JSON Web Token. Defaults to `Authorization`.
|
||||||
- **JWT_IN_BODY**: Specifies the enabling the token validation in the request body to the ONLYOFFICE Document Server. Defaults to `false`.
|
- **JWT_IN_BODY**: Specifies the enabling the token validation in the request body to the ONLYOFFICE Document Server. Defaults to `false`.
|
||||||
- **WOPI_ENABLED**: Specifies the enabling the wopi handlers. Defaults to `false`.
|
|
||||||
- **USE_UNAUTHORIZED_STORAGE**: Set to `true`if using selfsigned certificates for your storage server e.g. Nextcloud. Defaults to `false`
|
- **USE_UNAUTHORIZED_STORAGE**: Set to `true`if using selfsigned certificates for your storage server e.g. Nextcloud. Defaults to `false`
|
||||||
- **GENERATE_FONTS**: When 'true' regenerates fonts list and the fonts thumbnails etc. at each start. Defaults to `true`
|
- **GENERATE_FONTS**: When 'true' regenerates fonts list and the fonts thumbnails etc. at each start. Defaults to `true`
|
||||||
- **METRICS_ENABLED**: Specifies the enabling StatsD for ONLYOFFICE Document Server. Defaults to `false`.
|
- **METRICS_ENABLED**: Specifies the enabling StatsD for ONLYOFFICE Document Server. Defaults to `false`.
|
||||||
|
@ -249,7 +244,7 @@ sudo docker run --init --net onlyoffice --privileged -i -t -d --restart=always -
|
||||||
onlyoffice/mailserver
|
onlyoffice/mailserver
|
||||||
```
|
```
|
||||||
|
|
||||||
The additional parameters for mail server are available [here](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.workspace_enterprise.yml#L87).
|
The additional parameters for mail server are available [here](https://github.com/ONLYOFFICE/Docker-CommunityServer/blob/master/docker-compose.yml#L75).
|
||||||
|
|
||||||
To learn more, refer to the [ONLYOFFICE Mail Server documentation](https://github.com/ONLYOFFICE/Docker-MailServer "ONLYOFFICE Mail Server documentation").
|
To learn more, refer to the [ONLYOFFICE Mail Server documentation](https://github.com/ONLYOFFICE/Docker-MailServer "ONLYOFFICE Mail Server documentation").
|
||||||
|
|
||||||
|
@ -299,7 +294,7 @@ bash opensource-install.sh -md yourdomain.com
|
||||||
Or, use [docker-compose](https://docs.docker.com/compose/install "docker-compose"). For the mail server correct work you need to specify its hostname 'yourdomain.com'. Assuming you have docker-compose installed, execute the following command:
|
Or, use [docker-compose](https://docs.docker.com/compose/install "docker-compose"). For the mail server correct work you need to specify its hostname 'yourdomain.com'. Assuming you have docker-compose installed, execute the following command:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
wget https://raw.githubusercontent.com/ONLYOFFICE/Docker-CommunityServer/master/docker-compose.groups.yml
|
wget https://raw.githubusercontent.com/ONLYOFFICE/Docker-CommunityServer/master/docker-compose.yml
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -337,7 +332,7 @@ SaaS version: [https://www.onlyoffice.com/cloud-office.aspx](https://www.onlyoff
|
||||||
|
|
||||||
## User Feedback and Support
|
## User Feedback and Support
|
||||||
|
|
||||||
If you have any problems with or questions about this image, please visit our official forum to find answers to your questions: [forum.onlyoffice.com][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][2].
|
If you have any problems with or questions about this image, please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][2].
|
||||||
|
|
||||||
[1]: https://forum.onlyoffice.com
|
[1]: https://dev.onlyoffice.org
|
||||||
[2]: https://stackoverflow.com/questions/tagged/onlyoffice
|
[2]: https://stackoverflow.com/questions/tagged/onlyoffice
|
||||||
|
|
129
docker-bake.hcl
129
docker-bake.hcl
|
@ -1,129 +0,0 @@
|
||||||
variable "TAG" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "SHORTER_TAG" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "SHORTEST_TAG" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "COMPANY_NAME" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PREFIX_NAME" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PRODUCT_EDITION" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PRODUCT_NAME" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PACKAGE_VERSION" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "DOCKERFILE" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PLATFORM" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PACKAGE_BASEURL" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PACKAGE_FILE" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "RELEASE_BRANCH" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
### ↓ Variables for UCS build ↓
|
|
||||||
|
|
||||||
variable "BASE_IMAGE" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "PG_VERSION" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
### ↑ Variables for UCS build ↑
|
|
||||||
|
|
||||||
target "documentserver" {
|
|
||||||
target = "documentserver"
|
|
||||||
dockerfile = "${DOCKERFILE}"
|
|
||||||
tags = [
|
|
||||||
"docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}",
|
|
||||||
equal("unstable",RELEASE_BRANCH) ? "docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest": "",
|
|
||||||
]
|
|
||||||
platforms = ["${PLATFORM}"]
|
|
||||||
args = {
|
|
||||||
"COMPANY_NAME": "${COMPANY_NAME}"
|
|
||||||
"PRODUCT_NAME": "${PRODUCT_NAME}"
|
|
||||||
"PRODUCT_EDITION": "${PRODUCT_EDITION}"
|
|
||||||
"PACKAGE_VERSION": "${PACKAGE_VERSION}"
|
|
||||||
"PACKAGE_BASEURL": "${PACKAGE_BASEURL}"
|
|
||||||
"PLATFORM": "${PLATFORM}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
target "documentserver-stable" {
|
|
||||||
target = "documentserver-stable"
|
|
||||||
dockerfile = "production.dockerfile"
|
|
||||||
tags = ["docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}",
|
|
||||||
"docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}",
|
|
||||||
"docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${SHORTEST_TAG}",
|
|
||||||
"docker.io/${COMPANY_NAME}/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:latest",
|
|
||||||
equal("-ee",PRODUCT_EDITION) ? "docker.io/${COMPANY_NAME}4enterprise/${PREFIX_NAME}${PRODUCT_NAME}${PRODUCT_EDITION}:${TAG}": "",]
|
|
||||||
platforms = ["linux/amd64", "linux/arm64"]
|
|
||||||
args = {
|
|
||||||
"TAG": "${TAG}"
|
|
||||||
"COMPANY_NAME": "${COMPANY_NAME}"
|
|
||||||
"PRODUCT_NAME": "${PRODUCT_NAME}"
|
|
||||||
"PRODUCT_EDITION": "${PRODUCT_EDITION}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
target "documentserver-ucs" {
|
|
||||||
target = "documentserver"
|
|
||||||
dockerfile = "${DOCKERFILE}"
|
|
||||||
tags = [
|
|
||||||
"docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PRODUCT_EDITION}-ucs:${TAG}"
|
|
||||||
]
|
|
||||||
platforms = ["linux/amd64", "linux/arm64"]
|
|
||||||
args = {
|
|
||||||
"PRODUCT_EDITION": "${PRODUCT_EDITION}"
|
|
||||||
"PRODUCT_NAME": "${PRODUCT_NAME}"
|
|
||||||
"COMPANY_NAME": "${COMPANY_NAME}"
|
|
||||||
"PACKAGE_VERSION": "${PACKAGE_VERSION}"
|
|
||||||
"PACKAGE_BASEURL": "${PACKAGE_BASEURL}"
|
|
||||||
"BASE_IMAGE": "${BASE_IMAGE}"
|
|
||||||
"PG_VERSION": "${PG_VERSION}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
target "documentserver-nonexample" {
|
|
||||||
target = "documentserver-nonexample"
|
|
||||||
dockerfile = "production.dockerfile"
|
|
||||||
tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ]
|
|
||||||
platforms = ["linux/amd64", "linux/arm64"]
|
|
||||||
args = {
|
|
||||||
"TAG": "${TAG}"
|
|
||||||
"COMPANY_NAME": "${COMPANY_NAME}"
|
|
||||||
"PRODUCT_NAME": "${PRODUCT_NAME}"
|
|
||||||
"PRODUCT_EDITION": "${PRODUCT_EDITION}"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
### Arguments avavlivable only for FROM instruction ###
|
|
||||||
ARG TAG=latest
|
|
||||||
ARG COMPANY_NAME=onlyoffice
|
|
||||||
ARG PRODUCT_EDITION=
|
|
||||||
|
|
||||||
### Build main-release ###
|
|
||||||
|
|
||||||
FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${TAG} as documentserver-stable
|
|
||||||
|
|
||||||
### Build nonexample ###
|
|
||||||
|
|
||||||
FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${TAG} as documentserver-nonexample
|
|
||||||
|
|
||||||
ARG COMPANY_NAME=onlyoffice
|
|
||||||
ARG PRODUCT_NAME=documentserver
|
|
||||||
ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf
|
|
||||||
|
|
||||||
### Remove all documentserver-example data ###
|
|
||||||
|
|
||||||
RUN rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
|
|
||||||
&& rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example \
|
|
||||||
&& rm -f $DS_SUPERVISOR_CONF \
|
|
||||||
&& rm -f /etc/nginx/includes/ds-example.conf \
|
|
||||||
&& ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf $DS_SUPERVISOR_CONF
|
|
|
@ -1,7 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
umask 0022
|
|
||||||
|
|
||||||
function clean_exit {
|
function clean_exit {
|
||||||
/usr/bin/documentserver-prepare4shutdown.sh
|
/usr/bin/documentserver-prepare4shutdown.sh
|
||||||
}
|
}
|
||||||
|
@ -14,7 +12,6 @@ shopt -s globstar
|
||||||
APP_DIR="/var/www/${COMPANY_NAME}/documentserver"
|
APP_DIR="/var/www/${COMPANY_NAME}/documentserver"
|
||||||
DATA_DIR="/var/www/${COMPANY_NAME}/Data"
|
DATA_DIR="/var/www/${COMPANY_NAME}/Data"
|
||||||
PRIVATE_DATA_DIR="${DATA_DIR}/.private"
|
PRIVATE_DATA_DIR="${DATA_DIR}/.private"
|
||||||
DS_RELEASE_DATE="${PRIVATE_DATA_DIR}/ds_release_date"
|
|
||||||
LOG_DIR="/var/log/${COMPANY_NAME}"
|
LOG_DIR="/var/log/${COMPANY_NAME}"
|
||||||
DS_LOG_DIR="${LOG_DIR}/documentserver"
|
DS_LOG_DIR="${LOG_DIR}/documentserver"
|
||||||
LIB_DIR="/var/lib/${COMPANY_NAME}"
|
LIB_DIR="/var/lib/${COMPANY_NAME}"
|
||||||
|
@ -27,33 +24,26 @@ ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost}
|
||||||
ONLYOFFICE_DATA_CONTAINER_PORT=80
|
ONLYOFFICE_DATA_CONTAINER_PORT=80
|
||||||
|
|
||||||
RELEASE_DATE="$(stat -c="%y" ${APP_DIR}/server/DocService/docservice | sed -r 's/=([0-9]+)-([0-9]+)-([0-9]+) ([0-9:.+ ]+)/\1-\2-\3/')";
|
RELEASE_DATE="$(stat -c="%y" ${APP_DIR}/server/DocService/docservice | sed -r 's/=([0-9]+)-([0-9]+)-([0-9]+) ([0-9:.+ ]+)/\1-\2-\3/')";
|
||||||
if [ -f ${DS_RELEASE_DATE} ]; then
|
if [ -f ${PRIVATE_DATA_DIR}/release_date ]; then
|
||||||
PREV_RELEASE_DATE=$(head -n 1 ${DS_RELEASE_DATE})
|
PREV_RELEASE_DATE=$(head -n 1 ${PRIVATE_DATA_DIR}/release_date)
|
||||||
else
|
else
|
||||||
PREV_RELEASE_DATE="0"
|
PREV_RELEASE_DATE="0"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${RELEASE_DATE}" != "${PREV_RELEASE_DATE}" ]; then
|
if [ "${RELEASE_DATE}" != "${PREV_RELEASE_DATE}" ]; then
|
||||||
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
|
mkdir -p ${PRIVATE_DATA_DIR}
|
||||||
|
echo ${RELEASE_DATE} > ${PRIVATE_DATA_DIR}/release_date
|
||||||
IS_UPGRADE="true";
|
IS_UPGRADE="true";
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SSL_CERTIFICATES_DIR="/usr/share/ca-certificates/ds"
|
SSL_CERTIFICATES_DIR="${DATA_DIR}/certs"
|
||||||
mkdir -p ${SSL_CERTIFICATES_DIR}
|
if [[ -z $SSL_CERTIFICATE_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/onlyoffice.crt ]]; then
|
||||||
if [[ -d ${DATA_DIR}/certs ]] && [ -e ${DATA_DIR}/certs/*.crt ]; then
|
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt
|
||||||
cp -f ${DATA_DIR}/certs/* ${SSL_CERTIFICATES_DIR}
|
|
||||||
chmod 644 ${SSL_CERTIFICATES_DIR}/*.crt ${SSL_CERTIFICATES_DIR}/*.pem
|
|
||||||
chmod 400 ${SSL_CERTIFICATES_DIR}/*.key
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z $SSL_CERTIFICATE_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/${COMPANY_NAME}.crt ]]; then
|
|
||||||
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/${COMPANY_NAME}.crt
|
|
||||||
else
|
else
|
||||||
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-${SSL_CERTIFICATES_DIR}/tls.crt}
|
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-${SSL_CERTIFICATES_DIR}/tls.crt}
|
||||||
fi
|
fi
|
||||||
if [[ -z $SSL_KEY_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/${COMPANY_NAME}.key ]]; then
|
if [[ -z $SSL_KEY_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/onlyoffice.key ]]; then
|
||||||
SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/${COMPANY_NAME}.key
|
SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key
|
||||||
else
|
else
|
||||||
SSL_KEY_PATH=${SSL_KEY_PATH:-${SSL_CERTIFICATES_DIR}/tls.key}
|
SSL_KEY_PATH=${SSL_KEY_PATH:-${SSL_CERTIFICATES_DIR}/tls.key}
|
||||||
fi
|
fi
|
||||||
|
@ -73,29 +63,16 @@ NGINX_ONLYOFFICE_EXAMPLE_CONF="${NGINX_ONLYOFFICE_EXAMPLE_PATH}/includes/ds-exam
|
||||||
|
|
||||||
NGINX_CONFIG_PATH="/etc/nginx/nginx.conf"
|
NGINX_CONFIG_PATH="/etc/nginx/nginx.conf"
|
||||||
NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
|
NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
|
||||||
# Limiting the maximum number of simultaneous connections due to possible memory shortage
|
NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)}
|
||||||
[ $(ulimit -n) -gt 1048576 ] && NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1048576} || NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)}
|
|
||||||
|
|
||||||
JWT_ENABLED=${JWT_ENABLED:-true}
|
JWT_ENABLED=${JWT_ENABLED:-false}
|
||||||
|
JWT_SECRET=${JWT_SECRET:-secret}
|
||||||
# validate user's vars before usinig in json
|
|
||||||
if [ "${JWT_ENABLED}" == "true" ]; then
|
|
||||||
JWT_ENABLED="true"
|
|
||||||
else
|
|
||||||
JWT_ENABLED="false"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ -z $JWT_SECRET ] && JWT_MESSAGE='JWT is enabled by default. A random secret is generated automatically. Run the command "docker exec $(sudo docker ps -q) sudo documentserver-jwt-status.sh" to get information about JWT.'
|
|
||||||
|
|
||||||
JWT_SECRET=${JWT_SECRET:-$(pwgen -s 20)}
|
|
||||||
JWT_HEADER=${JWT_HEADER:-Authorization}
|
JWT_HEADER=${JWT_HEADER:-Authorization}
|
||||||
JWT_IN_BODY=${JWT_IN_BODY:-false}
|
JWT_IN_BODY=${JWT_IN_BODY:-false}
|
||||||
|
|
||||||
WOPI_ENABLED=${WOPI_ENABLED:-false}
|
|
||||||
|
|
||||||
GENERATE_FONTS=${GENERATE_FONTS:-true}
|
GENERATE_FONTS=${GENERATE_FONTS:-true}
|
||||||
|
|
||||||
if [[ ${PRODUCT_NAME}${PRODUCT_EDITION} == "documentserver" ]]; then
|
if [[ ${PRODUCT_NAME} == "documentserver" ]]; then
|
||||||
REDIS_ENABLED=false
|
REDIS_ENABLED=false
|
||||||
else
|
else
|
||||||
REDIS_ENABLED=true
|
REDIS_ENABLED=true
|
||||||
|
@ -141,7 +118,6 @@ read_setting(){
|
||||||
METRICS_PREFIX="${METRICS_PREFIX:-.ds}"
|
METRICS_PREFIX="${METRICS_PREFIX:-.ds}"
|
||||||
|
|
||||||
DB_HOST=${DB_HOST:-${POSTGRESQL_SERVER_HOST:-$(${JSON} services.CoAuthoring.sql.dbHost)}}
|
DB_HOST=${DB_HOST:-${POSTGRESQL_SERVER_HOST:-$(${JSON} services.CoAuthoring.sql.dbHost)}}
|
||||||
DB_TYPE=${DB_TYPE:-$(${JSON} services.CoAuthoring.sql.type)}
|
|
||||||
case $DB_TYPE in
|
case $DB_TYPE in
|
||||||
"postgres")
|
"postgres")
|
||||||
DB_PORT=${DB_PORT:-"5432"}
|
DB_PORT=${DB_PORT:-"5432"}
|
||||||
|
@ -160,6 +136,7 @@ read_setting(){
|
||||||
DB_NAME=${DB_NAME:-${POSTGRESQL_SERVER_DB_NAME:-$(${JSON} services.CoAuthoring.sql.dbName)}}
|
DB_NAME=${DB_NAME:-${POSTGRESQL_SERVER_DB_NAME:-$(${JSON} services.CoAuthoring.sql.dbName)}}
|
||||||
DB_USER=${DB_USER:-${POSTGRESQL_SERVER_USER:-$(${JSON} services.CoAuthoring.sql.dbUser)}}
|
DB_USER=${DB_USER:-${POSTGRESQL_SERVER_USER:-$(${JSON} services.CoAuthoring.sql.dbUser)}}
|
||||||
DB_PWD=${DB_PWD:-${POSTGRESQL_SERVER_PASS:-$(${JSON} services.CoAuthoring.sql.dbPass)}}
|
DB_PWD=${DB_PWD:-${POSTGRESQL_SERVER_PASS:-$(${JSON} services.CoAuthoring.sql.dbPass)}}
|
||||||
|
DB_TYPE=${DB_TYPE:-$(${JSON} services.CoAuthoring.sql.type)}
|
||||||
|
|
||||||
RABBITMQ_SERVER_URL=${RABBITMQ_SERVER_URL:-$(${JSON} rabbitmq.url)}
|
RABBITMQ_SERVER_URL=${RABBITMQ_SERVER_URL:-$(${JSON} rabbitmq.url)}
|
||||||
AMQP_URI=${AMQP_URI:-${AMQP_SERVER_URL:-${RABBITMQ_SERVER_URL}}}
|
AMQP_URI=${AMQP_URI:-${AMQP_SERVER_URL:-${RABBITMQ_SERVER_URL}}}
|
||||||
|
@ -200,7 +177,7 @@ parse_rabbitmq_url(){
|
||||||
# extract the host
|
# extract the host
|
||||||
local hostport="$(echo ${url/$userpass@/} | cut -d/ -f1)"
|
local hostport="$(echo ${url/$userpass@/} | cut -d/ -f1)"
|
||||||
# by request - try to extract the port
|
# by request - try to extract the port
|
||||||
local port="$(echo $hostport | grep : | sed -r 's_^.*:+|/.*$__g')"
|
local port="$(echo $hostport | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g')"
|
||||||
|
|
||||||
local host
|
local host
|
||||||
if [ -n "$port" ]; then
|
if [ -n "$port" ]; then
|
||||||
|
@ -304,17 +281,12 @@ update_rabbitmq_setting(){
|
||||||
}
|
}
|
||||||
|
|
||||||
update_redis_settings(){
|
update_redis_settings(){
|
||||||
${JSON} -I -e "if(this.services.CoAuthoring.redis===undefined)this.services.CoAuthoring.redis={};"
|
|
||||||
${JSON} -I -e "this.services.CoAuthoring.redis.host = '${REDIS_SERVER_HOST}'"
|
${JSON} -I -e "this.services.CoAuthoring.redis.host = '${REDIS_SERVER_HOST}'"
|
||||||
${JSON} -I -e "this.services.CoAuthoring.redis.port = '${REDIS_SERVER_PORT}'"
|
${JSON} -I -e "this.services.CoAuthoring.redis.port = '${REDIS_SERVER_PORT}'"
|
||||||
|
|
||||||
if [ -n "${REDIS_SERVER_PASS}" ]; then
|
|
||||||
${JSON} -I -e "this.services.CoAuthoring.redis.options = {'password':'${REDIS_SERVER_PASS}'}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
update_ds_settings(){
|
update_ds_settings(){
|
||||||
|
if [ "${JWT_ENABLED}" == "true" ]; then
|
||||||
${JSON} -I -e "this.services.CoAuthoring.token.enable.browser = ${JWT_ENABLED}"
|
${JSON} -I -e "this.services.CoAuthoring.token.enable.browser = ${JWT_ENABLED}"
|
||||||
${JSON} -I -e "this.services.CoAuthoring.token.enable.request.inbox = ${JWT_ENABLED}"
|
${JSON} -I -e "this.services.CoAuthoring.token.enable.request.inbox = ${JWT_ENABLED}"
|
||||||
${JSON} -I -e "this.services.CoAuthoring.token.enable.request.outbox = ${JWT_ENABLED}"
|
${JSON} -I -e "this.services.CoAuthoring.token.enable.request.outbox = ${JWT_ENABLED}"
|
||||||
|
@ -329,21 +301,17 @@ update_ds_settings(){
|
||||||
${JSON} -I -e "this.services.CoAuthoring.token.inbox.inBody = ${JWT_IN_BODY}"
|
${JSON} -I -e "this.services.CoAuthoring.token.inbox.inBody = ${JWT_IN_BODY}"
|
||||||
${JSON} -I -e "this.services.CoAuthoring.token.outbox.inBody = ${JWT_IN_BODY}"
|
${JSON} -I -e "this.services.CoAuthoring.token.outbox.inBody = ${JWT_IN_BODY}"
|
||||||
|
|
||||||
if [ -f "${ONLYOFFICE_EXAMPLE_CONFIG}" ]; then
|
if [ -f "${ONLYOFFICE_EXAMPLE_CONFIG}" ] && [ "${JWT_ENABLED}" == "true" ]; then
|
||||||
${JSON_EXAMPLE} -I -e "this.server.token.enable = ${JWT_ENABLED}"
|
${JSON_EXAMPLE} -I -e "this.server.token.enable = ${JWT_ENABLED}"
|
||||||
${JSON_EXAMPLE} -I -e "this.server.token.secret = '${JWT_SECRET}'"
|
${JSON_EXAMPLE} -I -e "this.server.token.secret = '${JWT_SECRET}'"
|
||||||
${JSON_EXAMPLE} -I -e "this.server.token.authorizationHeader = '${JWT_HEADER}'"
|
${JSON_EXAMPLE} -I -e "this.server.token.authorizationHeader = '${JWT_HEADER}'"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "${USE_UNAUTHORIZED_STORAGE}" == "true" ]; then
|
if [ "${USE_UNAUTHORIZED_STORAGE}" == "true" ]; then
|
||||||
${JSON} -I -e "if(this.services.CoAuthoring.requestDefaults===undefined)this.services.CoAuthoring.requestDefaults={}"
|
${JSON} -I -e "if(this.services.CoAuthoring.requestDefaults===undefined)this.services.CoAuthoring.requestDefaults={}"
|
||||||
${JSON} -I -e "if(this.services.CoAuthoring.requestDefaults.rejectUnauthorized===undefined)this.services.CoAuthoring.requestDefaults.rejectUnauthorized=false"
|
${JSON} -I -e "if(this.services.CoAuthoring.requestDefaults.rejectUnauthorized===undefined)this.services.CoAuthoring.requestDefaults.rejectUnauthorized=false"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${WOPI_ENABLED}" == "true" ]; then
|
|
||||||
${JSON} -I -e "if(this.wopi===undefined)this.wopi={}"
|
|
||||||
${JSON} -I -e "this.wopi.enable = true"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
create_postgresql_cluster(){
|
create_postgresql_cluster(){
|
||||||
|
@ -392,16 +360,18 @@ upgrade_postgresql_tbl() {
|
||||||
|
|
||||||
PSQL="psql -q -h$DB_HOST -p$DB_PORT -d$DB_NAME -U$DB_USER -w"
|
PSQL="psql -q -h$DB_HOST -p$DB_PORT -d$DB_NAME -U$DB_USER -w"
|
||||||
|
|
||||||
$PSQL -f "$APP_DIR/server/schema/postgresql/removetbl.sql"
|
for i in $(ls $APP_DIR/server/schema/postgresql/upgrade/upgrade*); do
|
||||||
$PSQL -f "$APP_DIR/server/schema/postgresql/createdb.sql"
|
$PSQL -f "${i}";
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
upgrade_mysql_tbl() {
|
upgrade_mysql_tbl() {
|
||||||
CONNECTION_PARAMS="-h$DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PWD -w"
|
CONNECTION_PARAMS="-h$DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PWD -w"
|
||||||
MYSQL="mysql -q $CONNECTION_PARAMS"
|
MYSQL="mysql -q $CONNECTION_PARAMS"
|
||||||
|
|
||||||
$MYSQL $DB_NAME < "$APP_DIR/server/schema/mysql/removetbl.sql" >/dev/null 2>&1
|
for i in $(ls $APP_DIR/server/schema/mysql/upgrade/upgrade*); do
|
||||||
$MYSQL $DB_NAME < "$APP_DIR/server/schema/mysql/createdb.sql" >/dev/null 2>&1
|
$MYSQL "$DB_NAME" < ${i} >/dev/null 2>&1;
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
create_postgresql_tbl() {
|
create_postgresql_tbl() {
|
||||||
|
@ -427,16 +397,11 @@ update_welcome_page() {
|
||||||
WELCOME_PAGE="${APP_DIR}-example/welcome/docker.html"
|
WELCOME_PAGE="${APP_DIR}-example/welcome/docker.html"
|
||||||
if [[ -e $WELCOME_PAGE ]]; then
|
if [[ -e $WELCOME_PAGE ]]; then
|
||||||
DOCKER_CONTAINER_ID=$(basename $(cat /proc/1/cpuset))
|
DOCKER_CONTAINER_ID=$(basename $(cat /proc/1/cpuset))
|
||||||
(( ${#DOCKER_CONTAINER_ID} < 12 )) && DOCKER_CONTAINER_ID=$(hostname)
|
|
||||||
if (( ${#DOCKER_CONTAINER_ID} >= 12 )); then
|
|
||||||
if [[ -x $(command -v docker) ]]; then
|
if [[ -x $(command -v docker) ]]; then
|
||||||
DOCKER_CONTAINER_NAME=$(docker inspect --format="{{.Name}}" $DOCKER_CONTAINER_ID)
|
DOCKER_CONTAINER_NAME=$(docker inspect --format="{{.Name}}" $DOCKER_CONTAINER_ID)
|
||||||
sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_NAME#/}"'/' -i $WELCOME_PAGE
|
sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_NAME#/}"'/' -i $WELCOME_PAGE
|
||||||
JWT_MESSAGE=$(echo $JWT_MESSAGE | sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_NAME#/}"'/')
|
|
||||||
else
|
else
|
||||||
sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_ID::12}"'/' -i $WELCOME_PAGE
|
sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_ID::12}"'/' -i $WELCOME_PAGE
|
||||||
JWT_MESSAGE=$(echo $JWT_MESSAGE | sed 's/$(sudo docker ps -q)/'"${DOCKER_CONTAINER_ID::12}"'/')
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -488,8 +453,6 @@ update_nginx_settings(){
|
||||||
if [ -f "${NGINX_ONLYOFFICE_EXAMPLE_CONF}" ]; then
|
if [ -f "${NGINX_ONLYOFFICE_EXAMPLE_CONF}" ]; then
|
||||||
sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF}
|
sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
update_supervisor_settings(){
|
update_supervisor_settings(){
|
||||||
|
@ -507,13 +470,8 @@ update_logrotate_settings(){
|
||||||
sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf
|
sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf
|
||||||
}
|
}
|
||||||
|
|
||||||
update_release_date(){
|
|
||||||
mkdir -p ${PRIVATE_DATA_DIR}
|
|
||||||
echo ${RELEASE_DATE} > ${DS_RELEASE_DATE}
|
|
||||||
}
|
|
||||||
|
|
||||||
# create base folders
|
# create base folders
|
||||||
for i in converter docservice metrics; do
|
for i in converter docservice spellchecker metrics; do
|
||||||
mkdir -p "${DS_LOG_DIR}/$i"
|
mkdir -p "${DS_LOG_DIR}/$i"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -525,7 +483,7 @@ for i in ${DS_LIB_DIR}/App_Data/cache/files ${DS_LIB_DIR}/App_Data/docbuilder ${
|
||||||
done
|
done
|
||||||
|
|
||||||
# change folder rights
|
# change folder rights
|
||||||
for i in ${LOG_DIR} ${LIB_DIR}; do
|
for i in ${LOG_DIR} ${LIB_DIR} ${DATA_DIR}; do
|
||||||
chown -R ds:ds "$i"
|
chown -R ds:ds "$i"
|
||||||
chmod -R 755 "$i"
|
chmod -R 755 "$i"
|
||||||
done
|
done
|
||||||
|
@ -549,6 +507,7 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
|
||||||
update_db_settings
|
update_db_settings
|
||||||
waiting_for_db
|
waiting_for_db
|
||||||
create_db_tbl
|
create_db_tbl
|
||||||
|
IS_UPGRADE="false"
|
||||||
else
|
else
|
||||||
# change rights for postgres directory
|
# change rights for postgres directory
|
||||||
chown -R postgres:postgres ${PG_ROOT}
|
chown -R postgres:postgres ${PG_ROOT}
|
||||||
|
@ -599,8 +558,6 @@ else
|
||||||
update_welcome_page
|
update_welcome_page
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find /etc/${COMPANY_NAME} -exec chown ds:ds {} \;
|
|
||||||
|
|
||||||
#start needed local services
|
#start needed local services
|
||||||
for i in ${LOCAL_SERVICES[@]}; do
|
for i in ${LOCAL_SERVICES[@]}; do
|
||||||
service $i start
|
service $i start
|
||||||
|
@ -609,6 +566,11 @@ done
|
||||||
if [ ${PG_NEW_CLUSTER} = "true" ]; then
|
if [ ${PG_NEW_CLUSTER} = "true" ]; then
|
||||||
create_postgresql_db
|
create_postgresql_db
|
||||||
create_postgresql_tbl
|
create_postgresql_tbl
|
||||||
|
IS_UPGRADE="false"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${IS_UPGRADE}" = "true" ]; then
|
||||||
|
upgrade_db_tbl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
|
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
|
||||||
|
@ -618,11 +580,6 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
|
||||||
waiting_for_redis
|
waiting_for_redis
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${IS_UPGRADE}" = "true" ]; then
|
|
||||||
upgrade_db_tbl
|
|
||||||
update_release_date
|
|
||||||
fi
|
|
||||||
|
|
||||||
update_nginx_settings
|
update_nginx_settings
|
||||||
|
|
||||||
update_supervisor_settings
|
update_supervisor_settings
|
||||||
|
@ -649,7 +606,5 @@ if [ "${GENERATE_FONTS}" == "true" ]; then
|
||||||
fi
|
fi
|
||||||
documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}
|
documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}
|
||||||
|
|
||||||
echo "${JWT_MESSAGE}"
|
|
||||||
|
|
||||||
tail -f /var/log/${COMPANY_NAME}/**/*.log &
|
tail -f /var/log/${COMPANY_NAME}/**/*.log &
|
||||||
wait $!
|
wait $!
|
||||||
|
|
Loading…
Reference in a new issue