From 62d0fd56fbd4129e92401cbcc4076fa94b67e58e Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Thu, 14 Jul 2022 16:19:51 -0700 Subject: [PATCH] 2.6 Release 7.2.12 - See CHANGELOG.md --- CHANGELOG.md | 6 ++++++ Dockerfile | 1 + 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a3c35..e12510e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 7.2.12 2022-07-14 + + ### Changed + - Stop patching one of the makefiles to allow successful builds + + ## 7.2.11 2022-07-14 ### Added diff --git a/Dockerfile b/Dockerfile index f8d8b70..9c80558 100755 --- a/Dockerfile +++ b/Dockerfile @@ -84,6 +84,7 @@ RUN set -x && \ \ ### Apply Patches cd /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/ && \ + rm -rf ./alpine/tests-make-add-missing-dependency.patch && \ for patch in ./alpine/*.patch; do echo "** Applying $patch"; patch -p1 < $patch; done && \ ### Compile OpenLDAP cd /tiredofit/openldap:$(head -n 1 /tiredofit/CHANGELOG.md | awk '{print $2'})/ && \