Skip to content

Commit

Permalink
Fixes broken rar extraction.
Browse files Browse the repository at this point in the history
  • Loading branch information
ipsingh06 committed Dec 31, 2020
1 parent cc5d04a commit 747cb82
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
28 changes: 17 additions & 11 deletions src/docker/build/docker-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,24 @@ ARG STAGING_VERSION=latest
FROM python:3.8-slim as seedsync_run_python_env

# Install dependencies
RUN apt-get update && apt-get install -y \
gcc \
libssl-dev \
lftp \
openssh-client \
p7zip \
p7zip-full \
bzip2 \
curl \
libnss-wrapper \
libxml2-dev libxslt-dev libffi-dev \
RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \
apt-get update && \
apt-get install -y \
gcc \
libssl-dev \
lftp \
openssh-client \
p7zip \
p7zip-full \
p7zip-rar \
bzip2 \
curl \
libnss-wrapper \
libxml2-dev libxslt-dev libffi-dev \
&& apt-get clean
# Fix for patoolib
# See: https://github.com/wummel/patool/issues/90
RUN ln -s /usr/lib/p7zip/Codecs/Rar.so /usr/lib/p7zip/Codecs/Rar29.so

# Install Poetry
RUN curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
Expand Down
2 changes: 1 addition & 1 deletion src/python/tests/unittests/test_lftp/test_lftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ def test_password_auth(self):
break
self.lftp.raise_pending_error()

@timeout_decorator.timeout(5)
@timeout_decorator.timeout(15)
def test_error_bad_password(self):
# exit the default instance
self.lftp.exit()
Expand Down

0 comments on commit 747cb82

Please sign in to comment.