Skip to content

Commit 61efd25

Browse files
tiredofittiredofit
committed
Release 2.6-7.4.0 - See CHANGELOG.md
1 parent e701ac1 commit 61efd25

File tree

6 files changed

+439
-172
lines changed

6 files changed

+439
-172
lines changed

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 2.6-7.4.0 2023-03-30 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Rework OpenLDAP Backup routines to become more in line with parent tiredofit/db-backup image
5+
- config and data both get compressed into same tar file going forward
6+
- Added ability to create "latest" symlink to last good backup
7+
- Added ability to "archive" backups to an archive folder after a specified period of time for better external backup capabilities
8+
9+
110
## 2.6-7.3.2 2023-03-07 <adrianparilli@github>
211

312
### Changed

‎Dockerfile

+42-42
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG OPENLDAP_VERSION
88

99
ENV OPENLDAP_VERSION=${OPENLDAP_VERSION:-"2.6.4"} \
1010
SCHEMA2LDIF_VERSION=1.3 \
11-
IMAGE_NAME="tiredofit/openldap:2.6" \
11+
IMAGE_NAME="tiredofit/openldap" \
1212
IMAGE_REPO_URL="https://github.com/tiredofit/docker-openldap/"
1313

1414
COPY CHANGELOG.md /tiredofit/
@@ -20,48 +20,49 @@ RUN source /assets/functions/00-container && \
2020
package update && \
2121
package upgrade && \
2222
package install .openldap-build-deps \
23-
alpine-sdk \
24-
autoconf \
25-
automake \
26-
build-base \
27-
bzip2-dev \
28-
cracklib-dev \
29-
cyrus-sasl-dev \
30-
db-dev \
31-
git \
32-
groff \
33-
heimdal-dev \
34-
libarchive-dev \
35-
libevent-dev \
36-
libsodium-dev \
37-
libtool \
38-
m4 \
39-
mosquitto-dev \
40-
openssl-dev \
41-
unixodbc-dev \
42-
util-linux-dev \
43-
xz-dev \
44-
&& \
23+
alpine-sdk \
24+
autoconf \
25+
automake \
26+
build-base \
27+
bzip2-dev \
28+
cracklib-dev \
29+
cyrus-sasl-dev \
30+
db-dev \
31+
git \
32+
groff \
33+
heimdal-dev \
34+
libarchive-dev \
35+
libevent-dev \
36+
libsodium-dev \
37+
libtool \
38+
m4 \
39+
mosquitto-dev \
40+
openssl-dev \
41+
unixodbc-dev \
42+
util-linux-dev \
43+
xz-dev \
44+
&& \
4545
\
4646
package install .openldap-run-deps \
47-
aws-cli \
48-
bzip2 \
49-
cyrus-sasl \
50-
coreutils \
51-
cracklib \
52-
iptables \
53-
libltdl \
54-
libuuid \
55-
libintl \
56-
libsodium \
57-
openssl \
58-
perl \
59-
pigz \
60-
sed \
61-
unixodbc \
62-
xz \
63-
zstd \
64-
&& \
47+
aws-cli \
48+
bzip2 \
49+
cyrus-sasl \
50+
coreutils \
51+
cracklib \
52+
iptables \
53+
libltdl \
54+
libuuid \
55+
libintl \
56+
libsodium \
57+
openssl \
58+
perl \
59+
pigz \
60+
sed \
61+
tar \
62+
unixodbc \
63+
xz \
64+
zstd \
65+
&& \
6566
\
6667
mkdir -p /usr/src/pixz && \
6768
curl -ssL https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.gz | tar xfz - --strip=1 -C /usr/src/pixz && \
@@ -83,7 +84,6 @@ RUN source /assets/functions/00-container && \
8384
mkdir -p contrib/slapd-modules/ppolicy-check-password && \
8485
git clone https://github.com/cedric-dufour/ppolicy-check-password /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/contrib/slapd-modules/ppolicy-check-password && \
8586
rm -rf /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/contrib/slapd-modules/ppm && \
86-
#mkdir -p contrib/slapd-modules/ppm && \
8787
git clone https://github.com/ltb-project/ppm /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/contrib/slapd-modules/ppm && \
8888
cd /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/alpine && \
8989
git filter-branch --prune-empty --subdirectory-filter main/openldap HEAD && \

‎README.md

+26-23
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tired
7474
```bash
7575
docker pull docker.io/tiredofdit/openldap:(imagetag)
7676
```
77-
Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-openldap/pkgs/container/docker-openldap)
78-
77+
Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-openldap/pkgs/container/docker-openldap)
78+
7979
```
8080
docker pull ghcr.io/tiredofit/docker-openldap:(imagetag)
81-
```
81+
```
82+
83+
Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-tiredofdit/pkgs/container/docker-tiredofdit)
8284

83-
Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-tiredofdit/pkgs/container/docker-tiredofdit)
84-
8585
```
8686
docker pull ghcr.io/tiredofit/docker-tiredofdit:(imagetag)
87-
```
87+
```
8888

8989
The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
9090

@@ -159,22 +159,25 @@ Be sure to view the following repositories to understand all the customizable op
159159
#### Backup Options:
160160

161161

162-
| Parameter | Description | Default |
163-
| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
164-
| `ENABLE_BACKUP` | Enable Backup System | `TRUE` |
165-
| `BACKUP_LOCATION` | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi | `FILESYSTEM` |
166-
| `BACKUP_COMPRESSION` | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE` | `GZ` |
167-
| `BACKUP_COMPRESSION_LEVEL` | Numberical value of what level of compression to use, most allow `1` to `9` except for `ZSTD` which allows for `1` to `19` | `3` |
168-
| `BACKUP_INTERVAL` | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day. | |
169-
| `BACKUP_BEGIN` | What time to do the first dump. Defaults to immediate. Must be in one of two formats | |
170-
| | Absolute HHMM, e.g. `2330` or `0415` | |
171-
| | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half | |
172-
| `BACKUP_RETENTION` | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | |
173-
| `BACKUP_MD5` | Generate MD5 Sum in Directory, `TRUE` or `FALSE` | `TRUE` |
174-
| `BACKUP_PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE` | `TRUE` |
175-
| `BACKUP_PATH` | Filesystem path on where to place backups | `/data/backup` |
176-
| `BACKUP_TEMP_LOCATION` | If you wish to specify a different location, enter it here | `/tmp/backups/" |
177-
162+
| Parameter | Description | Default |
163+
| ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
164+
| `ENABLE_BACKUP` | Enable Backup System | `TRUE` |
165+
| `BACKUP_BEGIN` | What time to do the first dump. Defaults to immediate. Must be in one of two formats | |
166+
| | Absolute HHMM, e.g. `2330` or `0415` | |
167+
| | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half | |
168+
| `BACKUP_ARCHIVE_TIME` | Value in minutes to move all files older than (x) from `BACKUP_PATH` to `BACKUP_PATH_ARCHIVE` - which is useful when pairing against an external backup system. |
169+
| `BACKUP_CHECKSUM` | `md5` or `sha1` | `md5` |
170+
| `BACKUP_COMPRESSION_LEVEL` | Numberical value of what level of compression to use, most allow `1` to `9` except for `ZSTD` which allows for `1` to `19` | `8` |
171+
| `BACKUP_COMPRESSION` | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or `none` `zstd` | `GZ` |
172+
| `BACKUP_CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-openldap-(config | data` | `TRUE` |
173+
| `BACKUP_ENABLE_CHECKSUM` | Enable checksum after backup `TRUE` or `FALSE` | `TRUE` |
174+
| `BACKUP_INTERVAL` | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day. | |
175+
| `BACKUP_LOCATION` | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi | `FILESYSTEM` |
176+
| `BACKUP_PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE` | `TRUE` |
177+
| `BACKUP_PATH_ARCHIVE` | Optional Directory where the database dumps archivess are kept. | `${BACKUP_PATH}/archive/` |
178+
| `BACKUP_PATH` | Filesystem path on where to place backups | `/data/backup` |
179+
| `BACKUP_RETENTION` | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | |
180+
| `BACKUP_TEMP_LOCATION` | If you wish to specify a different location, enter it here | `/tmp/backups/` |
178181

179182
##### Backing Up to S3 Compatible Services
180183

@@ -232,7 +235,7 @@ If you already have a check_password.conf or ppm.conf in /etc/openldap/ the foll
232235
| `TLS_RESET_PERMISSIONS` | Change permissions on certificate directories for OpenLDAP to read | `TRUE` |
233236
| `TLS_VERIFY_CLIENT` | TLS verify client. | `try` |
234237

235-
Help: http://www.openldap.org/doc/admin24/tls.html
238+
Help: http://www.openldap.org/doc/admin26/tls.html
236239

237240
#### Replication options
238241

‎install/assets/defaults/10-openldap

+12-9
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
22

33
ADD_DEFAULT_DATA=${ADD_DEFAULT_DATA:-"TRUE"}
44
ADMIN_PASS=${ADMIN_PASS:-"admin"}
5-
CONFIG_PASS=${CONFIG_PASS:-"config"}
6-
CONFIG_PATH=${CONFIG_PATH:-"/etc/openldap/"}
7-
BACKUP_TYPE=${BACKUP_TYPE:-"FILESYSTEM"}
8-
BACKUP_COMPRESSION=${BACKUP_COMPRESSION:-ZSTD}
9-
BACKUP_COMPRESSION_LEVEL=${BACKUP_COMPRESSION_LEVEL:-"3"}
105
BACKUP_BEGIN=${BACKUP_BEGIN:-0400}
11-
BACKUP_RETENTION=${BACKUP_RETENTION:-"10080"}
6+
BACKUP_COMPRESSION=${BACKUP_COMPRESSION:-"zstd"}
7+
BACKUP_COMPRESSION_LEVEL=${BACKUP_COMPRESSION_LEVEL:-"8"}
8+
BACKUP_CREATE_LATEST_SYMLINK=${BACKUP_CREATE_LATEST_SYMLINK:-"TRUE"}
129
BACKUP_INTERVAL=${BACKUP_INTERVAL:-1440}
13-
BACKUP_PATH=${BACKUP_PATH:-/data/backup}
14-
BACKUP_MD5=${BACKUP_MD5:-TRUE}
15-
BACKUP_PARALLEL_COMPRESSION=${BACKUP_PARALLEL_COMPRESSION:-TRUE}
10+
BACKUP_ENABLE_CHECKSUM=${BACKUP_ENABLE_CHECKSUM:-"TRUE"}
11+
BACKUP_CHECKSUM=${BACKUP_CHECKSUM:-"md5"}
12+
BACKUP_PARALLEL_COMPRESSION=${BACKUP_PARALLEL_COMPRESSION:-"TRUE"}
13+
BACKUP_PATH=${BACKUP_PATH:-"/data/backup/"}
14+
BACKUP_PATH_ARCHIVE=${BACKUP_PATH_ARCHIVE:-"${BACKUP_PATH}/archive/"}
15+
BACKUP_RETENTION=${BACKUP_RETENTION:-"10080"}
1616
BACKUP_SIZE_VALUE=${BACKUP_SIZE_VALUE:-"bytes"}
1717
BACKUP_TEMP_LOCATION=${BACKUP_TEMP_LOCATION:-"/tmp/backups"}
18+
BACKUP_TYPE=${BACKUP_TYPE:-"FILESYSTEM"}
19+
CONFIG_PASS=${CONFIG_PASS:-"config"}
20+
CONFIG_PATH=${CONFIG_PATH:-"/etc/openldap/"}
1821
DB_PATH=${DB_PATH:-"/var/lib/openldap"}
1922
DOMAIN=${DOMAIN:-"example.org"}
2023
ENABLE_BACKUP=${ENABLE_BACKUP:-"TRUE"}

0 commit comments

Comments
 (0)