diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml index 0cedb4e..83bce29 100644 --- a/.github/workflows/tags.yml +++ b/.github/workflows/tags.yml @@ -222,6 +222,7 @@ jobs: - Helm_chart_Tests - Build_Alpine - Build_Ubuntu + - Build_Debian steps: # Checkout diff --git a/build-scripts/postfix-install.sh b/build-scripts/postfix-install.sh index 70a17d9..034cb77 100644 --- a/build-scripts/postfix-install.sh +++ b/build-scripts/postfix-install.sh @@ -10,7 +10,7 @@ do_alpine() { apk add --upgrade cyrus-sasl cyrus-sasl-static cyrus-sasl-digestmd5 cyrus-sasl-crammd5 cyrus-sasl-login cyrus-sasl-ntlm apk add postfix apk add opendkim - apk add --upgrade ca-certificates tzdata supervisor rsyslog musl musl-utils bash opendkim-utils libcurl jsoncpp lmdb logrotate + apk add --upgrade ca-certificates tzdata supervisor rsyslog musl musl-utils bash opendkim-utils libcurl jsoncpp lmdb logrotate netcat-openbsd } do_ubuntu() { @@ -24,7 +24,7 @@ do_ubuntu() { apt-get install -y libsasl2-modules apt-get install -y postfix apt-get install -y opendkim - apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp25 sasl2-bin postfix-lmdb logrotate cron + apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp25 sasl2-bin postfix-lmdb logrotate cron net-tools ${RELEASE_SPECIFIC_PACKAGES} } if [ -f /etc/alpine-release ]; then diff --git a/integration-tests/external-tools-test/docker-compose.yml b/integration-tests/external-tools-test/docker-compose.yml new file mode 100644 index 0000000..9851c4e --- /dev/null +++ b/integration-tests/external-tools-test/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.7' +services: + tests: + hostname: "postfix" + image: "boky/postfix" + restart: no + volumes: + - "./tests:/tests" + environment: + FORCE_COLOR: "1" + ALLOWED_EMPTY_SENDER_DOMAINS: "example.org" + POSTFIX_smtpd_end_of_data_restrictions: "check_client_access static:discard" + entrypoint: [ "/bin/sh", "-c" ] + command: [ "/tests/test.sh" ] \ No newline at end of file diff --git a/integration-tests/external-tools-test/tests/test.sh b/integration-tests/external-tools-test/tests/test.sh new file mode 100755 index 0000000..3703a7f --- /dev/null +++ b/integration-tests/external-tools-test/tests/test.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -e +set -x + +if ! hash netstat; then + echo "netstat not found!" >2 + exit 1 +fi + +if ! hash nc; then + echo "netcat not found!" >2 + exit 1 +fi \ No newline at end of file