Merge branch 'hotfix-0.1.7' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.7
+  - Upgrade baseimage: light-baseimage:0.2.5
+
 ## 0.1.6
   - Upgrade baseimage: light-baseimage:0.2.4
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/backup-manager
-VERSION = 0.1.6
+VERSION = 0.1.7
 
 .PHONY: all build build-nocache test tag_latest release
 
@@ -15,7 +15,7 @@ test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
 tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 release: build test tag_latest
 	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi

README.md

@@ -5,7 +5,7 @@
 
 [hub]: https://hub.docker.com/r/osixia/backup-manager/
 
-Latest release: 0.1.6 - Backup Manager 0.7.10.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/backup-manager/) 
+Latest release: 0.1.7 - Backup Manager 0.7.10.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/backup-manager/) 
 
 An image to run periodically backup-manager.
 
@@ -22,7 +22,7 @@ An image to run periodically backup-manager.
 		- [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.1.6 image](#extend-osixiabackup-manager016-image)
+	- [Extend osixia/backup-manager:0.1.7 image](#extend-osixiabackup-manager017-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)
@@ -31,7 +31,7 @@ An image to run periodically backup-manager.
 ## Quick start
 
     # Run Backup Manager image
-    docker run --volume /host/data:/data-to-backup --detach osixia/backup-manager:0.1.6
+    docker run --volume /host/data:/data-to-backup --detach osixia/backup-manager:0.1.7
 
 ## Beginner Guide
 
@@ -50,7 +50,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.1.6
+      docker run --volume /data/my-backup-manager.conf:/container/service/backup-manager/assets/backup-manager.conf --detach osixia/backup-manager:0.1.7
 
 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
@@ -60,7 +60,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.1.6 --copy-service
+		docker run [your options] osixia/backup-manager:0.1.7 --copy-service
 
 ### Debug
 
@@ -69,11 +69,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.1.6 --loglevel debug
+	docker run --detach osixia/backup-manager:0.1.7 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/backup-manager:0.1.6 --help
+	docker run osixia/backup-manager:0.1.7 --help
 
 ## Environment Variables
 
@@ -84,7 +84,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
 - **BACKUP_MANAGER_TARBALL_DIRECTORIES**: Directories to backup: paths without spaces in their name. Defaults to `/data-to-backup /data-to-backup2`.
 
-- **BACKUP_MANAGER_CRON_EXP**: Cron expression to schedule backup-manager execution. Defaults to `"0 4 * * *"`. Every days at 4am.
+- **BACKUP_MANAGER_CRON_EXP**: Cron expression to schedule backup-manager execution. Defaults to `0 4 * * *`. Every days at 4am.
 
 - **BACKUP_MANAGER_TTL**: Backup TTL in days. Defaults to `15`.
 
@@ -112,14 +112,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.1.6
+	--detach osixia/backup-manager:0.1.7
 
 #### 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.1.6
+	--detach osixia/backup-manager:0.1.7
 
 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).
 
@@ -129,13 +129,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.1.6 image
+### Extend osixia/backup-manager:0.1.7 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.1.6
+    FROM osixia/backup-manager:0.1.7
     MAINTAINER Your Name <[email protected]>
 
     ADD environment /container/environment/01-custom
@@ -153,7 +153,7 @@ Clone this project :
 Adapt Makefile, set your image NAME and VERSION, for example :
 
 	NAME = osixia/backup-manager
-	VERSION = 0.1.6
+	VERSION = 0.1.7
 
 	becomes :
 	NAME = billy-the-king/backup-manager

image/Dockerfile

@@ -1,6 +1,6 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.4
+FROM osixia/light-baseimage:0.2.5
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Install Backup Manager, GNUPG for encryption and cron from baseimage

image/environment/default.yaml renamed to image/environment/default.startup.yaml

@@ -1,8 +1,8 @@
 # Directories to backup: paths without spaces in their name
-BACKUP_MANAGER_TARBALL_DIRECTORIES: "/data-to-backup /data-to-backup2"
+BACKUP_MANAGER_TARBALL_DIRECTORIES: /data-to-backup /data-to-backup2
 
 # Run backup-manager at 4:00am
-BACKUP_MANAGER_CRON_EXP: "0 4 * * *"
+BACKUP_MANAGER_CRON_EXP: 0 4 * * *
 
 # Delete backups that are over 15 days
 BACKUP_MANAGER_TTL: 15

image/service/backup-manager/assets/cronjobs

@@ -1,2 +1,3 @@
-# Backup OpenLDAP config
+# Backup
 {{ BACKUP_MANAGER_CRON_EXP }} root /usr/sbin/backup-manager 2>&1 | /usr/bin/logger -s -t backup-manager
+# empty line

test/test_helper.bash

@@ -30,19 +30,10 @@ clear_container() {
   remove_containers_by_cid $CONTAINER_ID
 }
 
-is_service_running() {
-  is_service_running_by_cid $CONTAINER_ID $1
+wait_process() {
+  wait_process_by_cid $CONTAINER_ID $@
 }
 
-is_file_exists() {
-  is_file_exists_by_cid $CONTAINER_ID $1
-}
-
-wait_service() {
-  wait_service_by_cid $CONTAINER_ID $@
-}
-
-
 # generic functions
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
@@ -78,30 +69,7 @@ clear_containers_by_cid() {
   remove_containers_by_cid $@
 }
 
-is_service_running_by_cid() {
-  docker exec $1 ps cax | grep $2  > /dev/null
-}
-
-is_file_exists_by_cid() {
-  docker exec $1 cat $2 > /dev/null 2>&1
-}
-
-wait_service_by_cid() {
-
+wait_process_by_cid() {
   cid=$1
-
-  # first wait image init end
-  while ! is_file_exists_by_cid $cid /container/run/state/startup-done
-  do
-    sleep 0.5
-  done
-
-  for service in "${@:2}"
-  do
-    # wait service
-    while ! is_service_running_by_cid $cid $service
-    do
-      sleep 0.5
-    done
-  done
+  docker exec $cid /container/tool/wait-process ${@:2}
 }