From cb463681317b432d5592323bd63811f6a19f4879 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 9 Oct 2018 17:33:14 +0200 Subject: [PATCH 1/3] Correct changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c307e..10d5b96 100644 --- a/CHANGELOG.md +++ b/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 From 81f6d0c657f75d0ad4c11e721642a0c88b111c27 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 14 Oct 2018 12:47:47 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e198a4a..5af26d2 100644 --- a/README.md +++ b/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) From 3601e107e19ac8e2f5964cbb5867d6a2a82f2dd9 Mon Sep 17 00:00:00 2001 From: Joel Linn Date: Mon, 26 Nov 2018 22:50:04 +0100 Subject: [PATCH 3/3] Support for ACLs Added the needed build dependencies so that rsync-bpc can support access control lists. See makedepends line of the alpine build file for vanilla rsync: https://git.alpinelinux.org/cgit/aports/tree/main/rsync/APKBUILD --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b49b51..b70580d 100644 --- a/Dockerfile +++ b/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 \