From 012b35d2f8c1a99ec9890e52d181d4d30f5b4d9a Mon Sep 17 00:00:00 2001 From: Dmitry Kireev Date: Fri, 27 Oct 2023 15:08:30 +0300 Subject: [PATCH 1/7] Cancel prepare4shutdown script during cluster installation (#673) * Cancel prepare4shutdown script during cluster installation * Fix line length --- run-document-server.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run-document-server.sh b/run-document-server.sh index 5883e270c..99b580cda 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -3,7 +3,10 @@ umask 0022 function clean_exit { - /usr/bin/documentserver-prepare4shutdown.sh + if [ ${ONLYOFFICE_DATA_CONTAINER} == "false" ] && \ + [ ${ONLYOFFICE_DATA_CONTAINER_HOST} == "localhost" ]; then + /usr/bin/documentserver-prepare4shutdown.sh + fi } trap clean_exit SIGTERM From 09ac8b546398bdb16198b9d8e4f0b370daa33807 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Mon, 20 Nov 2023 12:05:00 +0300 Subject: [PATCH 2/7] Fix build workflow runs names (#679) --- .github/workflows/4testing-build.yml | 9 +++++++++ .github/workflows/stable-build.yml | 1 + 2 files changed, 10 insertions(+) diff --git a/.github/workflows/4testing-build.yml b/.github/workflows/4testing-build.yml index def1e2c48..684f898d0 100644 --- a/.github/workflows/4testing-build.yml +++ b/.github/workflows/4testing-build.yml @@ -1,5 +1,14 @@ ### This workflow setup instance then build and push images ### name: 4testing multiarch-build +run-name: >- + Build #${{ inputs.build }} [ + ${{ inputs.amd64 && 'AMD64' || '-' }} + ${{ inputs.arm64 && 'ARM64' || '-' }} + ] [ + ${{ inputs.community && 'CE' || '-' }} + ${{ inputs.developer && 'DE' || '-' }} + ${{ inputs.enterprise && 'EE' || '-' }} + ] on: workflow_dispatch: diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index 9a197688a..fd493f316 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -1,5 +1,6 @@ ### This workflow setup instance then build and push images ### name: Multi-arch build stable +run-name: ${{ inputs.tag }} (${{ inputs.release_number }}) on: workflow_dispatch: From 6fc2b27fcfacc0b4ce37e87767dcc695a4a2d919 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Wed, 29 Nov 2023 16:33:41 +0700 Subject: [PATCH 3/7] fix Bug 65188 - Upgrade to a current version of postgresql (#690) --- .travis.yml | 18 +++++++++--------- docker-compose.yml | 2 +- tests/postgres.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 084cddc68..2e37ca68f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,23 +32,23 @@ env: SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key - # postgresql 12 + # postgresql 16 - config: postgres.yml - POSTGRES_VERSION: 12 + POSTGRES_VERSION: 16 - # postgresql 11 + # postgresql 15 - config: postgres.yml - POSTGRES_VERSION: 11 + POSTGRES_VERSION: 15 - # postgresql 10 + # postgresql 14 - config: postgres.yml - POSTGRES_VERSION: 10 + POSTGRES_VERSION: 14 - # postgresql 9 + # postgresql 13 - config: postgres.yml - POSTGRES_VERSION: 9 + POSTGRES_VERSION: 13 - # postgresql 9.5 + # postgresql 12 - config: postgres.yml # postgresql custom values diff --git a/docker-compose.yml b/docker-compose.yml index 51fafb235..6d925019e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: onlyoffice-postgresql: container_name: onlyoffice-postgresql - image: postgres:9.5 + image: postgres:12 environment: - POSTGRES_DB=onlyoffice - POSTGRES_USER=onlyoffice diff --git a/tests/postgres.yml b/tests/postgres.yml index 8333b10e1..bb0b418d9 100644 --- a/tests/postgres.yml +++ b/tests/postgres.yml @@ -20,7 +20,7 @@ services: onlyoffice-postgresql: container_name: onlyoffice-postgresql - image: postgres:${POSTGRES_VERSION:-9.5} + image: postgres:${POSTGRES_VERSION:-12} environment: - POSTGRES_DB=${POSTGRES_DB:-onlyoffice} - POSTGRES_USER=${POSTGRES_USER:-onlyoffice} From 276c5da9f5d0edeffeaca63a9e7dd4d810b92b74 Mon Sep 17 00:00:00 2001 From: Danil Titarenko <77471369+danilapog@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:45:12 +0300 Subject: [PATCH 4/7] Add the ability to manually launch the zap scanner (#691) * Add zap scanning for DocumentServer * Set branch name as ref for manual trigger * Use master as default zap action branch * Move zap action to master branch * Fix token variable name * Small cosmetic fix * Modify zap action trigger condition Run zap scanner only when documentserver edition hit community and branch hit in `release/` or `hotfix/` --- .github/workflows/4testing-build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/4testing-build.yml b/.github/workflows/4testing-build.yml index 684f898d0..9f291ff3c 100644 --- a/.github/workflows/4testing-build.yml +++ b/.github/workflows/4testing-build.yml @@ -101,6 +101,7 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build 4testing + id: build-ds run: | set -eux @@ -145,4 +146,29 @@ jobs: docker buildx bake -f docker-bake.hcl ${{ matrix.image }} --push echo "DONE: Build success" + + ### Set output for Zap scanner + ### NOTE: Output will be used only in release/hotfix branches + + echo "version=${TAG}" >> "$GITHUB_OUTPUT" + echo "branch=${BRANCH_NAME}" >> "$GITHUB_OUTPUT" shell: bash + + # Run scanner only when edition is community + # and branch hit release/ or hotfix/ + - name: Trigger zap manualy + if: >- + matrix.edition == '' && + (startsWith(steps.build-ds.outputs.branch, 'release/') || + startsWith(steps.build-ds.outputs.branch, 'hotfix/')) + env: + VERSION: ${{ steps.build-ds.outputs.version }} + BRANCH: ${{ steps.build-ds.outputs.branch }} + GITHUB_TOKEN: ${{ secrets.TOKEN }} + run: | + gh workflow run zap-ds.yaml \ + --repo ${{ github.repository }} \ + -f branch=${BRANCH} \ + -f version=${VERSION} + shell: bash + From cb06c6f6e1f1ca4f13af8d1d00b9c915a995ee58 Mon Sep 17 00:00:00 2001 From: Danil Titarenko <77471369+danilapog@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:21:34 +0300 Subject: [PATCH 5/7] Correct startup conditions for zap scanner (#694) --- .github/workflows/4testing-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/4testing-build.yml b/.github/workflows/4testing-build.yml index 9f291ff3c..138cd30e3 100644 --- a/.github/workflows/4testing-build.yml +++ b/.github/workflows/4testing-build.yml @@ -158,7 +158,7 @@ jobs: # and branch hit release/ or hotfix/ - name: Trigger zap manualy if: >- - matrix.edition == '' && + matrix.edition == 'community' && (startsWith(steps.build-ds.outputs.branch, 'release/') || startsWith(steps.build-ds.outputs.branch, 'hotfix/')) env: From 4ab054c502b169449f117817f30b187804e586dc Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Wed, 20 Dec 2023 21:54:56 +0500 Subject: [PATCH 6/7] Add DOCKER_ORG make variable (#696) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 546e5cc55..bb80cdef2 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ BUILD_CHANNEL ?= nightly ONLYOFFICE_VALUE ?= onlyoffice COMPANY_NAME_LOW = $(shell echo $(COMPANY_NAME) | tr A-Z a-z) -COMPANY_NAME_ESC = $(subst -,,$(COMPANY_NAME_LOW)) PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME)$(PRODUCT_EDITION) PACKAGE_VERSION ?= $(PRODUCT_VERSION)-$(BUILD_NUMBER)~stretch @@ -20,7 +19,8 @@ else DOCKER_TAG := $(PRODUCT_VERSION).$(BUILD_NUMBER)-$(subst /,-,$(GIT_BRANCH)) endif -DOCKER_IMAGE := $(COMPANY_NAME_ESC)/4testing-$(PRODUCT_NAME)$(PRODUCT_EDITION) +DOCKER_ORG ?= $(COMPANY_NAME_LOW) +DOCKER_IMAGE := $(DOCKER_ORG)/4testing-$(PRODUCT_NAME)$(PRODUCT_EDITION) DOCKER_DUMMY := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME)$(PRODUCT_EDITION)__$(DOCKER_TAG).dummy DOCKER_ARCH := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME)_$(DOCKER_TAG).tar.gz From 0a42ee66b0c25c40375f471998d0470b68504d29 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Thu, 18 Jan 2024 10:20:37 +0300 Subject: [PATCH 7/7] Fix bug #60688 (#703) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5df4eced3..499e72de0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-utils \ bomstrip \ certbot \ + cron \ curl \ htop \ libasound2 \