From d223ed2c7c51058ff75a9135f817a8895863b4bc Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 4 Apr 2024 15:00:37 +0700 Subject: [PATCH 1/4] Add automatic supply detection in OCI on upgrade (#192) --- install/OneClickInstall/docspace-install.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/install/OneClickInstall/docspace-install.sh b/install/OneClickInstall/docspace-install.sh index e36b96a0b9..4ab24ee409 100644 --- a/install/OneClickInstall/docspace-install.sh +++ b/install/OneClickInstall/docspace-install.sh @@ -35,6 +35,7 @@ PARAMETERS="$PARAMETERS -it COMMUNITY"; DOCKER=""; LOCAL_SCRIPTS="false" product="docspace" +product_sysname="onlyoffice"; FILE_NAME="$(basename "$0")" while [ "$1" != "" ]; do @@ -104,7 +105,7 @@ install_curl () { } read_installation_method () { - echo "Select 'Y' to install ONLYOFFICE $product using Docker (recommended). Select 'N' to install it using RPM/DEB packages."; + echo "Select 'Y' to install ${product_sysname^^} $product using Docker (recommended). Select 'N' to install it using RPM/DEB packages."; read -p "Install with Docker [Y/N/C]? " choice case "$choice" in y|Y ) @@ -135,14 +136,22 @@ if ! command_exists curl ; then install_curl; fi +if command_exists docker &> /dev/null && docker ps -a --format '{{.Names}}' | grep -q "${product_sysname}-api"; then + DOCKER="true" +elif command_exists apt-get &> /dev/null && dpkg -s ${product}-api >/dev/null 2>&1; then + DOCKER="false" +elif command_exists yum &> /dev/null && rpm -q ${product}-api >/dev/null 2>&1; then + DOCKER="false" +fi + if [ -z "$DOCKER" ]; then read_installation_method; fi if [ -z $GIT_BRANCH ]; then - DOWNLOAD_URL_PREFIX="https://download.onlyoffice.com/${product}" + DOWNLOAD_URL_PREFIX="https://download.${product_sysname}.com/${product}" else - DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}-buildtools/${GIT_BRANCH}/install/OneClickInstall" + DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/${product_sysname^^}/${product}-buildtools/${GIT_BRANCH}/install/OneClickInstall" fi if [ "$DOCKER" == "true" ]; then From 94e0f416f7ca59dfdff419bc57174abd16988ce4 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 4 Apr 2024 15:02:24 +0700 Subject: [PATCH 2/4] Exclude running github action on default and Docker OCI files (#193) --- .github/workflows/ci-oci-install.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml index 32750d4e4c..abb0f31ea5 100644 --- a/.github/workflows/ci-oci-install.yml +++ b/.github/workflows/ci-oci-install.yml @@ -5,6 +5,8 @@ on: types: [opened, reopened, synchronize] paths: - 'install/OneClickInstall/**' + - '!install/OneClickInstall/install-Docker.sh' + - '!install/OneClickInstall/docspace-install.sh' schedule: - cron: '00 20 * * 6' # At 23:00 on Saturday. From 26a55c624d3a87304b054c58d32b6bad1580ebd7 Mon Sep 17 00:00:00 2001 From: Maksim Chegulov Date: Thu, 4 Apr 2024 11:12:39 +0300 Subject: [PATCH 3/4] removed unnecessary DropBox connection settings --- config/autofac.consumers.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/autofac.consumers.json b/config/autofac.consumers.json index da6d4456a6..d98b946773 100644 --- a/config/autofac.consumers.json +++ b/config/autofac.consumers.json @@ -146,9 +146,7 @@ "dropboxClientSecret": "" }, "additional": { - "dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx", - "dropboxappkey" : "", - "dropboxappsecret" : "" + "dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" } } }, From 2753c669e3ce828e5b5e1b677641afdbfb2b6ce0 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Thu, 4 Apr 2024 12:36:54 +0300 Subject: [PATCH 4/4] Install lib for ffmpeg (#190) --- install/docker/Dockerfile.app | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install/docker/Dockerfile.app b/install/docker/Dockerfile.app index 906683607d..e7ed2dfff3 100644 --- a/install/docker/Dockerfile.app +++ b/install/docker/Dockerfile.app @@ -249,6 +249,13 @@ FROM dotnetrun AS files_services ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 WORKDIR ${BUILD_PATH}/products/ASC.Files/service/ +RUN echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 871920D1991BC93C && \ + apt-get -y update && \ + apt-get install -yq libssl1.1 && \ + rm -rf /var/lib/apt/lists/* + COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ . COPY --from=onlyoffice/ffvideo:6.0 --chown=onlyoffice:onlyoffice /usr/local /usr/local/