Skip to content

Commit

Permalink
Fix binary mismatch of docker container with rpm
Browse files Browse the repository at this point in the history
Signed-off-by: Aaron Huggins <[email protected]>
  • Loading branch information
Aaron Huggins committed Nov 2, 2022
1 parent 8951afd commit 536b84a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
3rdparty/onlyoffice
build
oo-extract
*.rpm
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 536b84a

Please sign in to comment.