Skip to content

Commit ec84328

Browse files
committed
upgrade to openldap:1.0.1
1 parent b1db694 commit ec84328

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Changelog
22

3+
## 0.1.1
4+
- Upgrade baseimage: osixia/openldap:1.0.1
5+
- Rename environment variables
6+
37
## 0.1.0
48
- Initial release

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/openldap-backup
2-
VERSION = 0.1.0
2+
VERSION = 0.1.1
33

44
.PHONY: all build test tag_latest release
55

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ For more information about docker data volume, please refer to :
2424

2525
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.
2626

27-
- **CRON_EXP_BACKUP_CONFIG**: Cron expression to schedule OpenLDAP config backup. Defaults to `"0 4 * * *"`. Every days at 4am.
27+
- **LDAP_BACKUP_CONFIG_CRON_EXP**: Cron expression to schedule OpenLDAP config backup. Defaults to `"0 4 * * *"`. Every days at 4am.
2828

29-
- **CRON_EXP_BACKUP_DATA**: Cron expression to schedule OpenLDAP data backup. Defaults to `"0 4 * * *"`. Every days at 4am.
29+
- **LDAP_BACKUP_DATA_CRON_EXP**: Cron expression to schedule OpenLDAP data backup. Defaults to `"0 4 * * *"`. Every days at 4am.
3030

3131
### Set environment variables at run time :
3232

3333
Environment variable can be set directly by adding the -e argument in the command line, for example :
3434

35-
docker run -e CRON_EXP_BACKUP_CONFIG="0 5 * * *" -d osixia/openldap-backup
35+
docker run -e LDAP_BACKUP_CONFIG_CRON_EXP="0 5 * * *" -d osixia/openldap-backup
3636

3737
Or by setting your own `env.yaml` file as a docker volume to `/etc/env.yaml`
3838

image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM osixia/openldap:1.0.0
1+
FROM osixia/openldap:1.0.1
22
MAINTAINER Bertrand Gouny <[email protected]>
33

44
# Use baseimage's init system.

image/env.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Backup config and data every day at 4:00am
2-
CRON_EXP_BACKUP_CONFIG: "0 4 * * *"
3-
CRON_EXP_BACKUP_DATA: "0 4 * * *"
2+
LDAP_BACKUP_CONFIG_CRON_EXP: "0 4 * * *"
3+
LDAP_BACKUP_DATA_CRON_EXP: "0 4 * * *"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Backup OpenLDAP config
2-
{{ CRON_EXP_BACKUP_CONFIG }} root /sbin/slapd-backup-config
2+
{{ LDAP_BACKUP_CONFIG_CRON_EXP }} root /sbin/slapd-backup-config
33

44
# Backup OpenLDAP data
5-
{{ CRON_EXP_BACKUP_DATA }} root /sbin/slapd-backup-data
5+
{{ LDAP_BACKUP_DATA_CRON_EXP }} root /sbin/slapd-backup-data

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ FIRST_START_DONE="/etc/docker-openldap-backup-first-start-done"
66
if [ ! -e "$FIRST_START_DONE" ]; then
77

88
# Adapt cronjobs file
9-
sed -i "s|{{ CRON_EXP_BACKUP_CONFIG }}|${CRON_EXP_BACKUP_CONFIG}|g" /container/service/slapd-backup/assets/cronjobs
10-
sed -i "s|{{ CRON_EXP_BACKUP_DATA }}|${CRON_EXP_BACKUP_DATA}|g" /container/service/slapd-backup/assets/cronjobs
9+
sed -i "s|{{ LDAP_BACKUP_CONFIG_CRON_EXP }}|${LDAP_BACKUP_CONFIG_CRON_EXP}|g" /container/service/slapd-backup/assets/cronjobs
10+
sed -i "s|{{ LDAP_BACKUP_DATA_CRON_EXP }}|${LDAP_BACKUP_DATA_CRON_EXP}|g" /container/service/slapd-backup/assets/cronjobs
1111

1212
touch $FIRST_START_DONE
1313
fi

0 commit comments

Comments
 (0)