diff --git a/Dockerfile b/Dockerfile index b355f7f..c291346 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,9 @@ RUN apk --no-cache --update add python3 rsync bash perl perl-archive-zip perl-xm # Install backuppc build dependencies && apk --no-cache --update --virtual build-dependencies add gcc g++ libgcc linux-headers autoconf automake make git patch perl-dev python3-dev expat-dev acl-dev attr-dev popt-dev curl wget \ # Install circusd (version 0.15.0 since 0.16.x appears to consume 100% of a CPU) - && python3 -m ensurepip \ - && pip3 install --upgrade pip circus==0.15.0 \ + && python3 -m venv /srv/venv \ + && /srv/venv/bin/pip install --upgrade pip wheel \ + && /srv/venv/bin/pip install --upgrade pip circus==0.15.0 \ # Compile and install BackupPC:XS && git clone https://github.com/backuppc/backuppc-xs.git /root/backuppc-xs --branch $BACKUPPC_XS_VERSION \ && cd /root/backuppc-xs \ diff --git a/files/run.sh b/files/run.sh index 9cf930d..845a8e7 100755 --- a/files/run.sh +++ b/files/run.sh @@ -5,4 +5,4 @@ mkdir -p /var/circus touch /var/circus/endpoint /var/circus/pubsub /var/circus/stats # Launch circus -exec /usr/bin/circusd /etc/circus.ini +exec /srv/venv/bin/circusd /etc/circus.ini