From 8906eb65cc0133c056e9b791b8f08e6db178bc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= <bojan@cekrlic.com>
Date: Fri, 27 Oct 2023 06:27:14 +0200
Subject: [PATCH] Fix: Update documentation, change building of latest and edge

---
 .github/workflows/master.yml |  8 ++++----
 .github/workflows/tags.yml   |  4 ++++
 README.md                    | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index fbe19c1..def4c2f 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -76,7 +76,7 @@ jobs:
           push: true
           tags: |
             boky/postfix-exporter:latest
-            boky/postfix-exporter:latest
+            boky/postfix-exporter:edge
           platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
           cache-from: type=local,src=/tmp/.buildx-cache/postfix-exporter,mode=max,compression=estargz
           cache-to: type=local,dest=/tmp/.buildx-cache-new/postfix-exporter
@@ -124,8 +124,8 @@ jobs:
           context: .
           push: true
           tags: |
-            boky/postfix:latest
-            boky/postfix:latest-alpine
+            boky/postfix:edge
+            boky/postfix:edge-alpine
           # linux/s390x: "rsyslog (no such package)"
           # Latest Alpine does not have all the packages for 386 anymore. :-(
           platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
@@ -172,7 +172,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: boky/postfix:latest-ubuntu
+          tags: boky/postfix:edge-ubuntu
           platforms: "linux/arm/v7,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
           cache-from: type=local,src=/tmp/.buildx-cache/ubuntu,mode=max,compression=estargz
           cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
index 510b671..9694b53 100644
--- a/.github/workflows/tags.yml
+++ b/.github/workflows/tags.yml
@@ -51,6 +51,7 @@ jobs:
         with:
           repository: kumina/postfix_exporter
           path: 'postfix_exporter'
+          ref: 'a6f58e9b2b2b4decc7e65c5a34b4fd53cd6665f1' # Latest commit we know that works
 
       # Buildkit setup
       - uses: ./.github/actions/buildx-setup
@@ -125,6 +126,8 @@ jobs:
           context: .
           push: true
           tags: |
+            boky/postfix:latest
+            boky/postfix:latest-alpine
             boky/postfix:${{ env.RELEASE_VERSION }}
             boky/postfix:${{ env.RELEASE_VERSION }}-alpine
             boky/postfix:${{ env.RELEASE_VERSION_NO_v }}
@@ -178,6 +181,7 @@ jobs:
           context: .
           push: true
           tags: |
+            boky/postfix:latest-ubuntu
             boky/postfix:${{ env.RELEASE_VERSION }}-ubuntu
             boky/postfix:${{ env.RELEASE_VERSION_NO_v }}-ubuntu
           platforms: "linux/arm/v7,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
diff --git a/README.md b/README.md
index f0850f2..d57e78a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Simple postfix relay host ("postfix null client") for your Docker containers. Ba
   - [Description](#description)
   - [TL;DR](#tldr)
   - [Updates](#updates)
+    - [v4.0.0](#v400)
     - [v3.0.0](#v300)
   - [Architectures](#architectures)
   - [Configuration options](#configuration-options)
@@ -114,6 +115,22 @@ by ISPs, already occupied by other services, and in general should only be used
 
 ## Updates
 
+### v4.0.0
+
+Several potentially "surprising" changes went into this issue and hence warrant a version upgrade:
+
+- Helm charts are now built with `v` and without `v` prefix.
+  As seen in [PR #141](https://github.com/bokysan/docker-postfix/pull/141) some tools rely on version not
+  having the prefix. I've seen both in the wild, so the image
+  now includes both. This should work and should hopefully provide most compatibility.
+- [master](https://github.com/bokysan/docker-postfix/tree/master/) branch now builds images called `edge`. `latest`
+  images are built from the last tag. We've had several issues
+  with people using the `latest` tag and reporting problems.
+  You can now rely on `latest` being the latest stable release.
+- Image now builds its own version of [postfix-exporter](https://github.com/kumina/postfix_exporter) and relies on this
+  third-party project. Checkout is from master branch, based
+  on specific SHA commit id. The same hash is used for master and tags.
+
 ### v3.0.0
 
 There's a potentially breaking change introduced now in `v3.0.0`: Oracle has changed the license of BerkleyDB to AGPL-3.0, making it