test m4 change 3

.woodpecker.yml

@@ -12,49 +12,7 @@ steps:
         from_secret: container_registry_password
       dockerfile: Dockerfile
     when:
-      - event: [push, tag]
+      - event: tag
-
-  scan_image:
-    image: aquasec/trivy
-    commands:
-      - env TRIVY_DISABLE_VEX_NOTICE=1 trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
-    when:
-      - event: [push, tag]
-
-  generate_sbom:
-    image: quay.io/wollud1969/woodpecker-helper:0.5.1
-    environment:
-      TRIVY_TOKEN:
-        from_secret: trivy_token
-      TRIVY_URL:
-        from_secret: trivy_url
-      DTRACK_API_KEY:
-        from_secret: dtrack_api_key
-      DTRACK_API_URL:
-        from_secret: dtrack_api_url
-    commands:
-      - HOME=/home/`id -nu`
-      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
-      - |
-        trivy image \
-              --server $TRIVY_URL \
-              --token $TRIVY_TOKEN \
-              --format cyclonedx \
-              --scanners license \
-              --output /tmp/sbom.xml \
-              $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA
-      - cat /tmp/sbom.xml
-      - |
-        curl -X "POST" \
-             -H "Content-Type: multipart/form-data" \
-             -H "X-Api-Key: $DTRACK_API_KEY" \
-             -F "autoCreate=true" \
-             -F "projectName=$CI_REPO" \
-             -F "projectVersion=$TAG" \
-             -F "bom=@/tmp/sbom.xml"\
-             "$DTRACK_API_URL/api/v1/bom"
-    when:
-      - event: [push, tag]
 
   build:
     image: plugins/kaniko
@@ -70,4 +28,4 @@ steps:
         from_secret: quay_password
       dockerfile: Dockerfile
     when:
-      - event: [tag]
+      - event: tag

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.21.3
+FROM alpine:3.23.2
 
 LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
 LABEL ImageName="quay.io/wollud1969/exim-docker"
@@ -25,7 +25,6 @@ WORKDIR /etc/exim
 EXPOSE 25
 
 CMD [ "./start.sh" ]
-#CMD [ "/usr/bin/m4 exim.conf.m4 > exim.conf && /usr/sbin/exim -bd -q15m -v" ]
 
  
 

examples/deploy.yml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: smtp
-          image: quay.io/wollud1969/exim-docker:0.3.2
+          image: quay.io/wollud1969/exim-docker:0.3.4
           envFrom:
             - secretRef:
                 name: smtp-secrets

exim.conf.m4

@@ -8,11 +8,6 @@ define(`RELAYNETS', esyscmd(`echo -n $RELAYNETS'))dnl
 define(`WHITELISTED_RECIPIENTS', esyscmd(`echo -n $WHITELISTED_RECIPIENTS'))dnl
 
 
-ifelse(SMARTHOST, `', `
-errprint(`Error: SMARTHOST not set')
-m4exit(1)
-')
-
 ifelse(HOSTNAME, `', `
 errprint(`Error: HOSTNAME not set')
 m4exit(1)
@@ -28,6 +23,20 @@ acl_smtp_rcpt = acl_check_rcpt
 
 tls_advertise_hosts =
 
+ifelse(SMARTHOST, `', `dnl
+# without smarthost
+begin routers
+dnslookup:
+  driver = dnslookup
+  domains = *
+  transport = remote_smtp
+
+begin transports
+remote_smtp:
+  driver = smtp
+
+', `dnl
+# with smarthost
 begin routers
 smarthost_route:
   driver = manualroute
@@ -56,6 +65,7 @@ login:
   public_name = LOGIN
   client_send = : SMARTHOST_USER : SMARTHOST_PASS
 ')
+')
 
 begin acl
 acl_check_rcpt:

readme.md

@@ -15,6 +15,8 @@ Four environment variables are used to configure the container:
 * `WHITELISTED_RECIPIENT`: Colon-separated list of whitelisted recipient domains, if empty no recipient restrictions will be applied
 
 
+If `SMARTHOST` is not given, mail delivery will be done directly via MX lookup instead of using a smarthost.
+
 ## Deployment
 
 Typically, don't expose the smtp port of this container to the default network of your Docker installation, otherwise it conflicts with a local MTA on the machine and it would be visible outside of the machine. Create a dedicated docker network, use that one as the default network for this container and connect other containers to that network. Afterwards, you can use the name of this container as smarthost address in the other containers.

tools/smtp-dialog.exp

@@ -4,13 +4,13 @@ package require base64
 
 
 # SMTP-Server und Port definieren
-set smtp_server "localhost"
+set smtp_server "172.16.3.33"
 set smtp_port "25"
 set timeout 25
 
 # Absender, Empfänger und Nachricht
 set sender $env(SMTP_SENDER)
-set recipient "test@hottis.de"
+set recipient $env(SMTP_RECIPIENT)
 set message "Subject: Test Email\r\n\r\nThis is a test email sent via an expect script."
 
 set smtp_user $env(SMTP_USER)
@@ -27,17 +27,21 @@ spawn nc -C $smtp_server $smtp_port
 expect "220 *"
 
 # HELO/EHLO senden
-send "EHLO de01rdsi01.krohnegroup.com\n"
+send "EHLO baikonur\n"
 expect "250 *"
 
-send "AUTH LOGIN\n"
+if {[info exists smtp_user] && $smtp_user ne ""} {
-expect "334 VXNlcm5hbWU6"
+  send "AUTH LOGIN\n"
+  expect "334 VXNlcm5hbWU6"
 
-send "$smtp_user_64\n"
+  send "$smtp_user_64\n"
-expect "334 UGFzc3dvcmQ6"
+  expect "334 UGFzc3dvcmQ6"
 
-send "$smtp_pass_64\n"
+  send "$smtp_pass_64\n"
-expect "235 2.7.0 Authentication successful"
+  expect "235 2.7.0 Authentication successful"
+} else {
+  puts "skip authentication"
+}
 
 # Absender definieren
 send "MAIL FROM:<$sender>\n"