diff --git a/CHANGELOG.md b/CHANGELOG.md index a1b92dd..9540e89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +## [4.3.2-6 - 01/06/2020] +### Changed +* Update base docker to Alpine 3.12 +* Update perl lib BackupPC::XS to 0.60 + ## [4.3.2-5 - 12/04/2020] ### Added * Introduce the Active Directory / LDAP authentication for the BackupPC Web UI. Authentication method diff --git a/Dockerfile b/Dockerfile index 343042d..835db92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.11.3 +FROM alpine:3.12.0 LABEL maintainer="Adrien Ferrand " ENV BACKUPPC_VERSION 4.3.2 -ENV BACKUPPC_XS_VERSION 0.59 +ENV BACKUPPC_XS_VERSION 0.60 ENV RSYNC_BPC_VERSION 3.1.2.1 ENV PAR2_VERSION v0.8.1 diff --git a/README.md b/README.md index 36b26e2..28b3451 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.3.2-5.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.3.2-5.svg)](https://microbadger.com/images/adferrand/backuppc:4.3.2-5) [![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:4.3.2-6.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.3.2-6.svg)](https://microbadger.com/images/adferrand/backuppc:4.3.2-6) [![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) diff --git a/VERSION b/VERSION index c63acbe..20c4572 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.2-4 +4.3.2-6 diff --git a/velero-annotations-controller b/velero-annotations-controller new file mode 160000 index 0000000..f4c613c --- /dev/null +++ b/velero-annotations-controller @@ -0,0 +1 @@ +Subproject commit f4c613cee6fec298ffb1e9e773a9fec76346e7eb