From a6002d2674f6a6c5154dff162f12b6c3e914fe44 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sat, 19 Aug 2017 19:13:55 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3a2ed3e..e0aa865 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # adferrand/backuppc ![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.1.3-7.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.1.3-7.svg)](https://microbadger.com/images/adferrand/backuppc:4.1.3-7) -* [Introduction](#introduction) * [Container functionalities](#container-functionalities) +* [About BackupPC](#about-backuppc) * [Basic usage](#basic-usage) * [Data persistency](#data-persistency) * [POSIX rights](#posix-rights) @@ -21,13 +21,6 @@ * [Shell access](#shell-access) * [Legacy version](#legacy-version) -## Introduction - -![BackupPC Logo](https://backuppc.github.io/backuppc/images/logos/logo320.png) -BackupPC is a free self-hosted backup software able to backup remote hosts through various ways like rsync, smb or tar. It supports full and incremental backups, and reconstruct automatically a usable verbatim from any backup version. Started with version 4, BackupPC uses a new way to store backups by a reverse delta approach and no hardlinks. - -See [BackupPC documentation](http://backuppc.sourceforge.net/BackupPC-4.1.1.html) for further details and how to use it. - ## Container functionalities This docker is designed to provide a ready-to-go and maintainable BackupPC instance for your backups. @@ -37,6 +30,13 @@ This docker is designed to provide a ready-to-go and maintainable BackupPC insta * Existing BackupPC configuration & pool are self-upgraded at first run of a newly created container instance. It allows for instance dockerisation of a pre-existing BackupPC v3.x instance. * Container image is constructed on top of an Alpine distribution to reduce the footprint. Image size is below 80MB. +## About BackupPC + +![BackupPC Logo](https://backuppc.github.io/backuppc/images/logos/logo320.png) +BackupPC is a free self-hosted backup software able to backup remote hosts through various ways like rsync, smb or tar. It supports full and incremental backups, and reconstruct automatically a usable verbatim from any backup version. Started with version 4, BackupPC uses a new way to store backups by a reverse delta approach and no hardlinks. + +See [BackupPC documentation](http://backuppc.sourceforge.net/BackupPC-4.1.1.html) for further details and how to use it. + ## Basic usage For testing purpose, you can create a new BackupPC instance with following command. From 19c7d167f529617e08396327e9dfe91a3788b03a Mon Sep 17 00:00:00 2001 From: Magnus Eriksson Date: Sat, 2 Sep 2017 18:45:26 +0200 Subject: [PATCH 2/2] TimeZone: fix inverted check of TZ and add a clarification to README. On Ubuntu 16.04.3, mounting /etc/localtime from host to container does not work. The container exits with error in entrypoint.sh. --- README.md | 2 +- files/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e0aa865..7da2cd5 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ docker run \ adferrand/backuppc ``` -Alternatively, you can sync the container timezone to its host by mounting the host file `/etc/localtime` to the container path `/etc/localtime`. +Alternatively, depending on the host OS, you can sync the container timezone to its host by mounting the host file `/etc/localtime` to the container path `/etc/localtime`. ```bash docker run \ diff --git a/files/entrypoint.sh b/files/entrypoint.sh index 6f813ad..d85f53d 100755 --- a/files/entrypoint.sh +++ b/files/entrypoint.sh @@ -6,7 +6,7 @@ if [ -f /firstrun ]; then echo 'If exist, configuration and data will be reused and upgraded as needed.' # Configure timezone if needed - if [ -z "$TZ" ]; then + if [ -n "$TZ" ]; then cp /usr/share/zoneinfo/$TZ /etc/localtime fi