jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/v4.1.2'

Browse source
This commit is contained in:
Alexey Golubev 2016-09-22 12:03:11 +03:00
commit a4bc2294d5
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -32,7 +32,7 @@ ADD run-document-server.sh /app/onlyoffice/run-document-server.sh
EXPOSE 80 443 EXPOSE 80 443
ARG REPO_URL="deb http://static.teamlab.com/repo/debian/ squeeze main" ARG REPO_URL="deb http://download.onlyoffice.com/repo/debian squeeze main"
ARG PRODUCT_NAME=onlyoffice-documentserver ARG PRODUCT_NAME=onlyoffice-documentserver
RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/onlyoffice.list && \ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/onlyoffice.list && \

16
Makefile
View file

@ -2,7 +2,21 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$(COMPANY_NAME)-$(PRODUCT_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ repo/" REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$(COMPANY_NAME)-$(PRODUCT_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ repo/"
ifeq ($(GIT_BRANCH), origin/develop) UPDATE_LATEST := false
ifneq (,$(findstring develop,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifneq (,$(findstring release,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifneq (,$(findstring hotfix,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifeq ($(UPDATE_LATEST), true)
DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION)) DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))
DOCKER_TAGS += latest DOCKER_TAGS += latest
else else