upgrade to openldap:1.0.1

Author: BertrandGouny

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
 
+## 0.1.1
+  - Upgrade baseimage: osixia/openldap:1.0.1
+  - Rename environment variables
+
 ## 0.1.0
   - Initial release

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 0.1.0
+VERSION = 0.1.1
 
 .PHONY: all build test tag_latest release
 

README.md

@@ -24,15 +24,15 @@ For more information about docker data volume, please refer to :
 
 Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/etc/env.yaml`. See examples below.
 
-- **CRON_EXP_BACKUP_CONFIG**: Cron expression to schedule OpenLDAP config backup. Defaults to `"0 4 * * *"`. Every days at 4am.
+- **LDAP_BACKUP_CONFIG_CRON_EXP**: Cron expression to schedule OpenLDAP config backup. Defaults to `"0 4 * * *"`. Every days at 4am.
 
-- **CRON_EXP_BACKUP_DATA**: Cron expression to schedule OpenLDAP data backup. Defaults to `"0 4 * * *"`. Every days at 4am.
+- **LDAP_BACKUP_DATA_CRON_EXP**: Cron expression to schedule OpenLDAP data backup. Defaults to `"0 4 * * *"`. Every days at 4am.
 
 ### Set environment variables at run time :
 
 Environment variable can be set directly by adding the -e argument in the command line, for example :
 
-	docker run -e CRON_EXP_BACKUP_CONFIG="0 5 * * *" -d osixia/openldap-backup
+	docker run -e LDAP_BACKUP_CONFIG_CRON_EXP="0 5 * * *" -d osixia/openldap-backup
 
 Or by setting your own `env.yaml` file as a docker volume to `/etc/env.yaml`
 

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.0.0
+FROM osixia/openldap:1.0.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage's init system.

image/env.yaml

@@ -1,3 +1,3 @@
 # Backup config and data every day at 4:00am
-CRON_EXP_BACKUP_CONFIG: "0 4 * * *"
-CRON_EXP_BACKUP_DATA: "0 4 * * *"
+LDAP_BACKUP_CONFIG_CRON_EXP: "0 4 * * *"
+LDAP_BACKUP_DATA_CRON_EXP: "0 4 * * *"

image/service/slapd-backup/assets/cronjobs

@@ -1,5 +1,5 @@
 # Backup OpenLDAP config
-{{ CRON_EXP_BACKUP_CONFIG }} root /sbin/slapd-backup-config
+{{ LDAP_BACKUP_CONFIG_CRON_EXP }} root /sbin/slapd-backup-config
 
 # Backup OpenLDAP data
-{{ CRON_EXP_BACKUP_DATA }} root /sbin/slapd-backup-data
+{{ LDAP_BACKUP_DATA_CRON_EXP }} root /sbin/slapd-backup-data

image/service/slapd-backup/container-start.sh

@@ -6,8 +6,8 @@ FIRST_START_DONE="/etc/docker-openldap-backup-first-start-done"
 if [ ! -e "$FIRST_START_DONE" ]; then
 
   # Adapt cronjobs file
-  sed -i "s|{{ CRON_EXP_BACKUP_CONFIG }}|${CRON_EXP_BACKUP_CONFIG}|g" /container/service/slapd-backup/assets/cronjobs
-  sed -i "s|{{ CRON_EXP_BACKUP_DATA }}|${CRON_EXP_BACKUP_DATA}|g" /container/service/slapd-backup/assets/cronjobs
+  sed -i "s|{{ LDAP_BACKUP_CONFIG_CRON_EXP }}|${LDAP_BACKUP_CONFIG_CRON_EXP}|g" /container/service/slapd-backup/assets/cronjobs
+  sed -i "s|{{ LDAP_BACKUP_DATA_CRON_EXP }}|${LDAP_BACKUP_DATA_CRON_EXP}|g" /container/service/slapd-backup/assets/cronjobs
 
   touch $FIRST_START_DONE
 fi