Skip to content

Commit

Permalink
Fix: Fix for #146.
Browse files Browse the repository at this point in the history
  • Loading branch information
bokysan committed Oct 27, 2023
1 parent 3370a9d commit 0ff0e80
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ jobs:
- Helm_chart_Tests
- Build_Alpine
- Build_Ubuntu
- Build_Debian

steps:
# Checkout
Expand Down
4 changes: 2 additions & 2 deletions build-scripts/postfix-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand Down
14 changes: 14 additions & 0 deletions integration-tests/external-tools-test/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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" ]
13 changes: 13 additions & 0 deletions integration-tests/external-tools-test/tests/test.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0ff0e80

Please sign in to comment.