Skip to content

Commit

Permalink
Revert "docker: Hotfix of CollaboraOnline#9948"
Browse files Browse the repository at this point in the history
This reverts commit db4cfa6.
Reason: no longer necessary. We use the hotfix to build new images.
Next build will use the fixed packages.

Signed-off-by: Andras Timar <[email protected]>
Change-Id: I900f86b2fcccf9a3e5eb886d7e895fb3a579f374
  • Loading branch information
timar committed Sep 3, 2024
1 parent db4cfa6 commit 1da4be6
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions docker/from-packages/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ RUN --mount=type=secret,id=secret_key \
# Cleanup
rm -rf /var/lib/apt/* && \
# Remove WOPI Proof key generated by the package, we need unique key for each container
rm -rf /etc/coolwsd/proof_key* && \
# Hotfix https://github.com/CollaboraOnline/online/issues/9948
setcap cap_fowner,cap_chown,cap_sys_chroot=ep /usr/bin/coolforkit-caps || true && \
setcap cap_sys_admin=ep /usr/bin/coolmount || true
rm -rf /etc/coolwsd/proof_key*

# FIXME
# Use the old starter script until we find out how to replace it.
Expand Down

0 comments on commit 1da4be6

Please sign in to comment.