Fix: Fix deploymen of TLS certificates, script exec and Ubuntu build

thienohs · May 29, 2021 · 13bdabe · 13bdabe
1 parent 3b37f91
commit 13bdabe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -48,5 +48,5 @@ jobs:
         env:
           DOCKER_USERNAME: 'boky'
           DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}'
-          PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
+          PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
         run: ./build.sh -t boky/postfix:ubuntu-latest --build-arg=BASE_IMAGE=ubuntu:focal --push
diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
@@ -39,7 +39,7 @@ jobs:
         env:
           DOCKER_USERNAME: 'boky'
           DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}'
-          PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
+          PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
         run: ./build.sh -t boky/postfix:ubuntu-$RELEASE_VERSION --build-arg=BASE_IMAGE=ubuntu:focal --push
       - name: Copy `README.md` and `LICENCE` into the helm chart
         id: readme_and_licence

diff --git a/helm/mail/templates/configmap.yaml b/helm/mail/templates/configmap.yaml
@@ -18,6 +18,8 @@ data:
   {{- end }}
   {{- if .Values.certs.create }}
   _enable_tls.sh: |
+    #!/usr/bin/env bash
+    set -e
     do_postconf -e 'smtp_use_tls=yes'
     do_postconf -e 'smtp_tls_note_starttls_offer=yes'
     do_postconf -e 'smtpd_tls_cert_file=/var/run/certs/tls.crt'

diff --git a/helm/mail/templates/statefulset.yaml b/helm/mail/templates/statefulset.yaml
@@ -99,8 +99,9 @@ spec:
           emptyDir: {}
         {{- if .Values.certs.create }}
         - name: certs-init
-          secret:
-            configMapName: {{ $fullName }}
+          configMap:
+            name: {{ $fullName }}
+            defaultMode: 0755
         - name: certs
           secret:
             secretName: {{ $fullName }}-certs

diff --git a/helm/mail/values.yaml b/helm/mail/values.yaml
@@ -113,9 +113,9 @@ persistence:
 
 
 readinessProbe:
-  initialDelaySeconds: 30
+  initialDelaySeconds: 10
   periodSeconds: 60
-  failureThreshold: 2
+  failureThreshold: 6
   exec:
     command:
       - sh

diff --git a/scripts/common-run.sh b/scripts/common-run.sh
@@ -495,6 +495,7 @@ execute_post_init_scripts() {
 						. "$f"
 					else
 						echo -e "\trunning ${emphasis}bash $f${reset}"
+						bash "$f"
 					fi
 					;;
 				*)
-Original file line number
+Diff line change
@@ Expand Up / @@ -495,6 +495,7 @@ execute_post_init_scripts() { @@
     						. "$f"
     					else
     						echo -e "\trunning ${emphasis}bash $f${reset}"
+    						bash "$f"
     					fi
     					;;
     				*)
@@ Expand Down @@