diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 2cbf113..0000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: automerge -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - check_suite: - types: - - completed - status: {} -jobs: - automerge: - runs-on: ubuntu-latest - steps: - - name: automerge - uses: "pascalgn/automerge-action@7ab42e888a333bf77ce865bc84fedc6a365a3548" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_RETRIES: 30 - MERGE_RETRY_SLEEP: 10000 - MERGE_METHOD: merge diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 892d913..df35f55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,6 @@ on: jobs: tests: runs-on: ubuntu-latest - if: github.event_name == 'pull_request' - steps: - uses: actions/checkout@v1 @@ -28,8 +26,9 @@ jobs: deploy: runs-on: ubuntu-latest + needs: + - tests if: github.event_name == 'push' - steps: - uses: actions/checkout@v1 diff --git a/Dockerfile b/Dockerfile index 968934d..d149415 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.18 ARG ARG_POSTFIX_VERSION diff --git a/README.md b/README.md index 7479ba3..d8323b9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Simple postfix host intended for container clusters like swarm, Kubernetes, k3s, This image allows you to run a postfix server (**plain SMTP only**) internally inside your docker cluster installation to centralise outgoing email sending. -This image is not for a production environment since there is no way to configure TLS, authentication, relay, etc. +This image is not suitable for a production environment since there is no way to configure TLS, authentication, relay, etc." ## How to run diff --git a/conf.env b/conf.env index eb1202d..d72359b 100644 --- a/conf.env +++ b/conf.env @@ -1,2 +1,2 @@ -POSTFIX_VERSION=3.6.3-r0 +POSTFIX_VERSION=3.8.2-r0 DOCKER_IMAGE=dcarrillo/postfix