From 849830c04c8225111fc0867d29813c869772eae1 Mon Sep 17 00:00:00 2001 From: Matthieu Bollot Date: Thu, 5 Oct 2017 23:18:11 +0200 Subject: [PATCH 1/5] Add install of openssh-client and libnet-amazon-s3-perl to allow use of scp and s3 methods --- image/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/image/Dockerfile b/image/Dockerfile index 2f773c3..2d37152 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get -y update \ && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ backup-manager \ gnupg \ + openssh-client \ + libnet-amazon-s3-perl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 48596692b010c4752106dd93a709d67c05721249 Mon Sep 17 00:00:00 2001 From: Matthieu Bollot Date: Thu, 5 Oct 2017 23:32:03 +0200 Subject: [PATCH 2/5] Fix indentation, use tabs instead of spaces --- image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image/Dockerfile b/image/Dockerfile index 2d37152..a766f65 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -11,8 +11,8 @@ RUN apt-get -y update \ && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ backup-manager \ gnupg \ - openssh-client \ - libnet-amazon-s3-perl \ + openssh-client \ + libnet-amazon-s3-perl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From ebce14d5b40ec3f11b528686b2e44d6e5d023192 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 6 Oct 2017 09:57:47 +0200 Subject: [PATCH 3/5] [twgit] Init release 'release-0.2.1'. From 1dcfd6e9bb44199993d7900fb38fdd5e5723e1b0 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 6 Oct 2017 10:00:12 +0200 Subject: [PATCH 4/5] v0.2.1 --- Makefile | 2 +- README.md | 22 +++++++++++----------- image/Dockerfile | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8594019..7fa7d46 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/backup-manager -VERSION = 0.2.0 +VERSION = 0.2.1 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 9e51775..ef4f311 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/backup-manager/ -Latest release: 0.2.0 - Backup Manager 0.7.12.4 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/backup-manager/)  +Latest release: 0.2.1 - Backup Manager 0.7.12.4 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/backup-manager/)  **A docker image to run periodically backup-manager.** > https://github.com/sukria/Backup-Manager @@ -23,7 +23,7 @@ Latest release: 0.2.0 - Backup Manager 0.7.12.4 - [Changelog](CHANGELOG.md) | [D - [Link environment file](#link-environment-file) - [Make your own image or extend this image](#make-your-own-image-or-extend-this-image) - [Advanced User Guide](#advanced-user-guide) - - [Extend osixia/backup-manager:0.2.0 image](#extend-osixiabackup-manager020-image) + - [Extend osixia/backup-manager:0.2.1 image](#extend-osixiabackup-manager021-image) - [Make your own backup-manager image](#make-your-own-backup-manager-image) - [Tests](#tests) - [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage) @@ -32,7 +32,7 @@ Latest release: 0.2.0 - Backup Manager 0.7.12.4 - [Changelog](CHANGELOG.md) | [D ## Quick start # Run Backup Manager image - docker run --volume /host/data:/data-to-backup --detach osixia/backup-manager:0.2.0 + docker run --volume /host/data:/data-to-backup --detach osixia/backup-manager:0.2.1 ## Beginner Guide @@ -51,7 +51,7 @@ but setting your own backup-manager.conf is possible. 2 options: - Link your config file at run time to `/container/service/backup-manager/assets/backup-manager.conf` : - docker run --volume /data/my-backup-manager.conf:/container/service/backup-manager/assets/backup-manager.conf --detach osixia/backup-manager:0.2.0 + docker run --volume /data/my-backup-manager.conf:/container/service/backup-manager/assets/backup-manager.conf --detach osixia/backup-manager:0.2.1 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide) @@ -61,7 +61,7 @@ You may have some problems with mounted files on some systems. The startup scrip To fix that run the container with `--copy-service` argument : - docker run [your options] osixia/backup-manager:0.2.0 --copy-service + docker run [your options] osixia/backup-manager:0.2.1 --copy-service ### Debug @@ -70,11 +70,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`. Example command to run the container in `debug` mode: - docker run --detach osixia/backup-manager:0.2.0 --loglevel debug + docker run --detach osixia/backup-manager:0.2.1 --loglevel debug See all command line options: - docker run osixia/backup-manager:0.2.0 --help + docker run osixia/backup-manager:0.2.1 --help ## Environment Variables @@ -127,14 +127,14 @@ More help: https://raw.githubusercontent.com/sukria/Backup-Manager/master/doc/us Environment variables can be set by adding the --env argument in the command line, for example: docker run --env BACKUP_MANAGER_TARBALL_DIRECTORIES="/home/billy" \ - --detach osixia/backup-manager:0.2.0 + --detach osixia/backup-manager:0.2.1 #### Link environment file For example if your environment file is in : /data/backup-manager/environment/my-env.yaml docker run --volume /data/backup-manager/environment/my-env.yaml:/container/environment/01-custom/env.yaml \ - --detach osixia/backup-manager:0.2.0 + --detach osixia/backup-manager:0.2.1 Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE). @@ -144,13 +144,13 @@ This is the best solution if you have a private registry. Please refer to the [A ## Advanced User Guide -### Extend osixia/backup-manager:0.2.0 image +### Extend osixia/backup-manager:0.2.1 image If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image. Dockerfile example: - FROM osixia/backup-manager:0.2.0 + FROM osixia/backup-manager:0.2.1 MAINTAINER Your Name ADD environment /container/environment/01-custom diff --git a/image/Dockerfile b/image/Dockerfile index 2f773c3..8095477 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,6 +1,6 @@ # Use osixia/light-baseimage # sources: https://github.com/osixia/docker-light-baseimage -FROM osixia/light-baseimage:1.1.0 +FROM osixia/light-baseimage:1.1.1 MAINTAINER Bertrand Gouny # Install Backup Manager, GNUPG for encryption and cron from baseimage From c194531d0463ee13087b3fbe77a0dda4c5a69338 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 6 Oct 2017 10:15:36 +0200 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69d61ac..96d93c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.2.1 + - Add openssh-client and libnet-amazon-s3-perl + - Upgrade baseimage: light-baseimage:1.1.1 + ## 0.2.0 - Add incremental tarball support - Backup Manager 0.7.12.4