From 1415a42984504196180a2b4d683e7d48145dd846 Mon Sep 17 00:00:00 2001 From: Sheogorath <sheogorath@shivering-isles.com> Date: Thu, 12 Oct 2023 02:46:55 +0200 Subject: [PATCH] feat(mok): Add OCI standard labels to dovecot and postfix --- charts/mok/Chart.yaml | 2 +- charts/mok/README.md | 6 +++--- charts/mok/values.yaml | 4 ++-- images/dovecot/.release | 2 +- images/dovecot/Earthfile | 3 +-- images/postfix/.release | 2 +- images/postfix/Earthfile | 1 + 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml index 102bc05ab..a50ec04ed 100644 --- a/charts/mok/Chart.yaml +++ b/charts/mok/Chart.yaml @@ -3,7 +3,7 @@ name: mok description: | Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret. type: application -version: 0.9.6 +version: 0.9.7 sources: - https://de.postfix.org/ftpmirror/index.html - https://github.com/dovecot/core diff --git a/charts/mok/README.md b/charts/mok/README.md index c9a7bae78..35d03532f 100644 --- a/charts/mok/README.md +++ b/charts/mok/README.md @@ -1,6 +1,6 @@ # mok -  +  Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret. @@ -23,7 +23,7 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run | dovecot.affinity | object | `{}` | | | dovecot.image.pullPolicy | string | `"IfNotPresent"` | | | dovecot.image.repository | string | `"quay.io/shivering-isles/dovecot"` | dovecot container image | -| dovecot.image.tag | string | `"0.3.1"` | Overrides the image tag whose default is "latest" | +| dovecot.image.tag | string | `"0.3.2"` | Overrides the image tag whose default is "latest" | | dovecot.imagePullSecrets | list | `[]` | pull secret to access the afore defined image | | dovecot.nodeSelector | object | `{}` | | | dovecot.podAnnotations | object | `{}` | | @@ -56,7 +56,7 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run | postfix.hostname | string | `nil` | explicitly set postfix hostname | | postfix.image.pullPolicy | string | `"IfNotPresent"` | | | postfix.image.repository | string | `"quay.io/shivering-isles/postfix"` | postfix container image | -| postfix.image.tag | string | `"0.5.1"` | Overrides the image tag whose default is "latest" | +| postfix.image.tag | string | `"0.5.2"` | Overrides the image tag whose default is "latest" | | postfix.imagePullSecrets | list | `[]` | | | postfix.nodeSelector | object | `{}` | | | postfix.podAnnotations | object | `{}` | | diff --git a/charts/mok/values.yaml b/charts/mok/values.yaml index 5bf2be5c5..0c20e064c 100644 --- a/charts/mok/values.yaml +++ b/charts/mok/values.yaml @@ -46,7 +46,7 @@ postfix: repository: quay.io/shivering-isles/postfix pullPolicy: IfNotPresent # -- Overrides the image tag whose default is "latest" - tag: "0.5.1" + tag: "0.5.2" imagePullSecrets: [] @@ -126,7 +126,7 @@ dovecot: repository: quay.io/shivering-isles/dovecot pullPolicy: IfNotPresent # -- Overrides the image tag whose default is "latest" - tag: "0.3.1" + tag: "0.3.2" # -- pull secret to access the afore defined image imagePullSecrets: [] diff --git a/images/dovecot/.release b/images/dovecot/.release index 20765e296..c0fd37de2 100644 --- a/images/dovecot/.release +++ b/images/dovecot/.release @@ -1 +1 @@ -release=0.3.1 +release=0.3.2 diff --git a/images/dovecot/Earthfile b/images/dovecot/Earthfile index de17c2866..afb3bf13a 100644 --- a/images/dovecot/Earthfile +++ b/images/dovecot/Earthfile @@ -1,7 +1,5 @@ VERSION 0.7 - - container: FROM ../mirror+alpine ARG registry=quay.io/shivering-isles/dovecot @@ -52,6 +50,7 @@ container: EXPOSE 24 110 143 993 995 4190 12345 ENTRYPOINT ["/usr/sbin/dovecot", "-F"] + DO ../.utils/+LABEL --image=dovecot --version=main IF [ $latest = "true" ] SAVE IMAGE --push ${registry}:latest ELSE diff --git a/images/postfix/.release b/images/postfix/.release index 81392602c..70915b5ac 100644 --- a/images/postfix/.release +++ b/images/postfix/.release @@ -1 +1 @@ -release=0.5.1 +release=0.5.2 diff --git a/images/postfix/Earthfile b/images/postfix/Earthfile index 6462b303d..56e150739 100644 --- a/images/postfix/Earthfile +++ b/images/postfix/Earthfile @@ -38,6 +38,7 @@ container: EXPOSE 25 465 587 10025 ENTRYPOINT [ "sh" , "/usr/local/libexec/start.sh" ] + DO ../.utils/+LABEL --image=postfix --version=main IF [ $latest = "true" ] SAVE IMAGE --push ${registry}:latest ELSE -- GitLab