From 536b84a09403b97a05f26d7b11de6a0a2ccc1db8 Mon Sep 17 00:00:00 2001 From: Aaron Huggins Date: Wed, 2 Nov 2022 13:16:52 -0500 Subject: [PATCH] Fix binary mismatch of docker container with rpm Signed-off-by: Aaron Huggins --- .gitignore | 2 ++ Makefile | 14 +++++++++----- README.md | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3102d96..2f42eec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ 3rdparty/onlyoffice build +oo-extract +*.rpm \ No newline at end of file diff --git a/Makefile b/Makefile index 1109e55..7267b49 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,15 @@ clean: 3rdparty/onlyoffice/documentserver: mkdir -p 3rdparty/onlyoffice - docker create --name oo-extract onlyoffice/documentserver:7.2.1 - docker cp oo-extract:/var/www/onlyoffice/documentserver 3rdparty/onlyoffice - docker rm oo-extract - chmod -R 777 3rdparty/ - cp 3rdparty/onlyoffice/documentserver/server/FileConverter/bin/lib*.so* 3rdparty/onlyoffice/documentserver/server/tools/ + mkdir -p oo-extract + curl -sLO https://github.com/ONLYOFFICE/DocumentServer/releases/download/v7.2.1/onlyoffice-documentserver.x86_64.rpm + cd oo-extract && rpm2cpio ../onlyoffice-documentserver.x86_64.rpm | cpio -idm + chmod -R 777 oo-extract/ + cp -r oo-extract/var/www/onlyoffice/documentserver 3rdparty/onlyoffice + cp oo-extract/usr/lib64/* 3rdparty/onlyoffice/documentserver/server/FileConverter/bin/ + cp oo-extract/usr/lib64/* 3rdparty/onlyoffice/documentserver/server/tools/ + rm -rf oo-extract + rm -f onlyoffice-documentserver.x86_64.rpm rm -rf 3rdparty/onlyoffice/documentserver/server/{Common,DocService} cd 3rdparty/onlyoffice/documentserver/server/tools && \ ./allfontsgen \ diff --git a/README.md b/README.md index 218aaec..cdd3251 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Specific commands and paths will differ based on your specific setup. ## Setup from git -When installing from git `make` and `docker` are required. +When installing from git `make`, `curl`, `rpm2cpio`, and `cpio` are required. - clone the repo into the Nextcloud app directory - run `make` in the app folder to download the 3rdparty components