From b3e2e8daeb1b10cd1a96a97e7325cac6bee6177b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= Date: Sat, 29 May 2021 17:22:29 +0200 Subject: [PATCH] Fix: Remove linux/s390x build from Alpine Alpine doesn't seem to have rsyslog compiled for linux/s390x and will therefore fail the build. --- .github/workflows/master.yml | 4 ++-- .github/workflows/tags.yml | 4 ++-- README.md | 2 ++ helm/mail/values.yaml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index dfbbf34..35c9685 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,11 +42,11 @@ jobs: env: DOCKER_USERNAME: 'boky' DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}' - PLATFORMS: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x" + PLATFORMS: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" # linux/s390x: "rsyslog (no such package)" run: ./build.sh -t boky/postfix:latest --push - name: Build Ubuntu master env: DOCKER_USERNAME: 'boky' DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}' PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x" - run: ./build.sh -t boky/postfix:ubuntu-latest --push + 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 index 7ad12b3..7da7ae4 100644 --- a/.github/workflows/tags.yml +++ b/.github/workflows/tags.yml @@ -33,14 +33,14 @@ jobs: env: DOCKER_USERNAME: 'boky' DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}' - PLATFORMS: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x" + PLATFORMS: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" run: ./build.sh -t boky/postfix:$RELEASE_VERSION --push - name: Build Ubuntu tag env: DOCKER_USERNAME: 'boky' DOCKER_PASSWORD: '${{ secrets.DOCKER_ACCESS_TOKEN }}' PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x" - run: ./build.sh -t boky/postfix:ubuntu-$RELEASE_VERSION --push + 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 shell: bash diff --git a/README.md b/README.md index 98c93e5..65d5466 100644 --- a/README.md +++ b/README.md @@ -460,6 +460,7 @@ Chart configuration is as follows: | `service.labels` | `{}` | Additional service labels | | `service.annotations` | `{}` | Additional service annotations | | `service.nodePort` | *empty* | Use a specific `nodePort` | +| `service.nodeIP` | *empty* | Use a specific `nodeIP` | | `resources` | `{}` | [Pod resources](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | | `autoscaling.enabled` | `false` | Set to `true` to enable [Horisontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | | `autoscaling.minReplicas` | `1` | Minimum number of replicas | @@ -471,6 +472,7 @@ Chart configuration is as follows: | `nodeSelector` | `{}` | Standard Kubernetes stuff | | `tolerations` | `[]` | Standard Kubernetes stuff | | `affinity` | `{}` | Standard Kubernetes stuff | +| `certs.create` | `{}` | Auto generate TLS certificates for Postfix | | `extraVolumes` | `[]` | Append any extra volumes to the pod | | `extraVolumeMounts` | `[]` | Append any extra volume mounts to the postfix container | | `extraInitContainers` | `[]` | Execute any extra init containers on startup | diff --git a/helm/mail/values.yaml b/helm/mail/values.yaml index daf6981..66335d8 100644 --- a/helm/mail/values.yaml +++ b/helm/mail/values.yaml @@ -71,7 +71,7 @@ container: # Auto-generate certificates for the server and mount them into Postfix volume certs: - create: true + create: false # Define data which should be stored in a Secret # (and shared with the pod as environment variables)