From 88b58bffc5597ba6d29e477a9fced75f0ebdd440 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Sat, 14 Nov 2020 12:37:58 -0800
Subject: [PATCH] Release 2.3.2 - See CHANGELOG.md

---
 CHANGELOG.md |  6 ++++++
 Dockerfile   | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b1b77..0b79b81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.3.2 2020-11-14 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Reapply S6-Overlay into filesystem as Postgresql build is removing S6 files due to edge containing S6 overlay
+
+
 ## 2.3.1 2020-11-11 <bambi73@github>
 
    ### Fixed
diff --git a/Dockerfile b/Dockerfile
index ccce26a..2ac6564 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -148,7 +148,19 @@ RUN set -ex && \
 ### Cleanup
     apk del .db-backup-build-deps && \
     rm -rf /usr/src/* && \
-    rm -rf /tmp/* /var/cache/apk/*
+    rm -rf /tmp/* /var/cache/apk/* && \
+    \
+### Temp Hack for S6 Overlay && \
+### S6 installation
+    apkArch="$(apk --print-arch)"; \
+	case "$apkArch" in \
+		x86_64) s6Arch='amd64' ;; \
+		armhf) s6Arch='armhf' ;; \
+		aarch64) s6Arch='aarch64' ;; \
+		ppc64le) s6Arch='ppc64le' ;; \
+		*) echo >&2 "Error: unsupported architecture ($apkArch)"; exit 1 ;; \
+	esac; \
+    curl -sSL https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${s6Arch}.tar.gz | tar xfz - -C /
 
 ### S6 Setup
     ADD install  /