Release 2.6-7.6.1 - See CHANGELOG.md

tiredofit · May 31, 2023 · 10d36e1 · 10d36e1
1 parent 9f05d5e
commit 10d36e1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.6-7.6.1 2023-05-31 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for backups not being created in tar format
+      - Transform config and data files into their own folder in tar file for better extraction
+
+
 ## 2.6-2.6-7.6 2023-05-10 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/README.md b/README.md
@@ -74,16 +74,17 @@ Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tired
 ```bash
 docker pull docker.io/tiredofit/openldap:(imagetag)
 ```
+
 Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-openldap/pkgs/container/docker-openldap)
 
 ```
 docker pull ghcr.io/tiredofit/docker-openldap:(imagetag)
 ```
 
-Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-tiredofdit/pkgs/container/docker-tiredofdit)
+Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-tiredofdit/pkgs/container/docker-tiredofit)
 
 ```
-docker pull ghcr.io/tiredofit/docker-tiredofdit:(imagetag)
+docker pull ghcr.io/tiredofit/docker-tiredofit:(imagetag)
 ```
 
 The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
@@ -101,7 +102,7 @@ Images are built primarily for `amd64` architecture, and may also include builds
 
 ### Quick Start
 
-* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/docker-compose.yml) that can be modified for development or production use.
+* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [compose.yml](examples/compose.yml) that can be modified for development or production use.
 
 * Set various [environment variables](#environment-variables) to understand the capabilities of this image.
 * Map [persistent storage](#data-volumes) for access to configuration and data files for backup.

diff --git a/examples/docker-compose.yml → examples/compose.yml b/examples/docker-compose.yml → examples/compose.yml
diff --git a/install/etc/services.available/20-openldap-backup/run b/install/etc/services.available/20-openldap-backup/run
@@ -64,26 +64,27 @@ compression() {
     case "${BACKUP_COMPRESSION,,}" in
     bz*)
         print_notice "Compressing backup with bzip2"
-        target=${target}.bz2
-        tar --use-compress-program="${bzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data
+        target=${target}.tar.bz2
+        tar --use-compress-program="${bzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data --transform "s|config|${now}-openldap_${CONTAINER_NAME}/config|" --transform "s|data|${now}-openldap_${CONTAINER_NAME}/data|"
         ;;
     gz*)
         print_notice "Compressing backup with gzip"
-        target=${target}.gz
-        tar --use-compress-program="${gzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data
+        target=${target}.tar.gz
+        tar --use-compress-program="${gzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data --transform "s|config|${now}-openldap_${CONTAINER_NAME}/config|" --transform "s|data|${now}-openldap_${CONTAINER_NAME}/data|"
         ;;
     "none" | "false")
-        tar -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data
+        target=${target}.tar
+        tar -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data --transform "s|config|${now}-openldap_${CONTAINER_NAME}/config|" --transform "s|data|${now}-openldap_${CONTAINER_NAME}/data|"
         ;;
     xz*)
         print_notice "Compressing backup with xzip"
-        target=${target}.xz
-        tar --use-compress-program="${xzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data
+        target=${target}.tar.xz
+        tar --use-compress-program="${xzip} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data --transform "s|config|${now}-openldap_${CONTAINER_NAME}/config|" --transform "s|data|${now}-openldap_${CONTAINER_NAME}/data|"
         ;;
     zst*)
         print_notice "Compressing backup with zstd"
-        target=${target}.zst
-        tar --use-compress-program="${zstd} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data
+        target=${target}.tar.zst
+        tar --use-compress-program="${zstd} " -cf "${BACKUP_TEMP_LOCATION}"/"${target}" -C "${BACKUP_TEMP_LOCATION}" config data --transform "s|config|${now}-openldap_${CONTAINER_NAME}/config|" --transform "s|data|${now}-openldap_${CONTAINER_NAME}/data|"
         ;;
     esac
 }