Merge branch 'master' into 4

CHANGELOG.md

@@ -2,14 +2,14 @@
 
 ## Unreleased
 
-## [4.2.1-1] - 14/05/2018
+## [4.2.1-2] - 09/10/2018
 ### Added
-* Set up a complete CI/CD system for this Docker, using CircleCI: docker is noz automatically packaged, tested and deployed to Docker Hub
+* Set up a complete CI/CD system for this Docker, using CircleCI: docker is now automatically packaged, tested and deployed to Docker Hub
 
 ### Changed
 * Hotfix for BZIP2 binary, due to latest Alpine layout modifications, is now applied when the container is created, removing the error `n: /bin/bzip2: File exists` when container is restarted.
 
-## [4.2.1-1] - 14/05/2018
+## [4.2.1-1] - 12/09/2018
 ### Added
 * Add and configure circus, an alternative to supervisor, compatible with Python 3, with better control over environment variables propagation, and network sockets supervision (not used yet here)
 * Mandatory perl modules for Backuppc are now installed as pre-compiled binaries from Alpine repos

Dockerfile

@@ -10,7 +10,7 @@ ENV PAR2_VERSION v0.8.0
 # Install backuppc runtime dependencies
 RUN apk --no-cache --update add python3 rsync bash perl perl-archive-zip perl-xml-rss perl-cgi perl-file-listing expat samba-client iputils openssh openssl rrdtool msmtp lighttpd lighttpd-mod_auth gzip apache2-utils tzdata libstdc++ libgomp shadow \
 # 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 curl wget \
+ && 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 supervisor
  && python3 -m ensurepip \
  && pip3 install --upgrade pip circus \

README.md

@@ -1,5 +1,5 @@
 #  ![](https://raw.githubusercontent.com/adferrand/docker-backuppc/master/images/logo_200px.png) adferrand/backuppc
-![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.2.1-2.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.2.1-2.svg)](https://microbadger.com/images/adferrand/backuppc:4.2.1-2) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
+![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc.svg)](https://microbadger.com/images/adferrand/backuppc) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
 
 * [Container functionalities](#container-functionalities)
 * [About BackupPC](#about-backuppc)