From 2825db85084803ba62077e8a72f56c6545ffb08b Mon Sep 17 00:00:00 2001
From: Dirk Wirts <d.wirts@asmodee.com>
Date: Mon, 20 Nov 2023 17:23:40 +0100
Subject: [PATCH] =?UTF-8?q?Weitere=20Daeien=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible-create_mailrelay.yml | 12 +++++++-----
 setups/dockerfile            |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ansible-create_mailrelay.yml b/ansible-create_mailrelay.yml
index 1175ff8..51257c6 100644
--- a/ansible-create_mailrelay.yml
+++ b/ansible-create_mailrelay.yml
@@ -22,6 +22,8 @@
       ansible.builtin.pip:
         name: cryptography
         version: '>=1.2.3'
+        name: docker
+        name: docker-compose
       become: yes
 
     - name: Create necessary directories
@@ -64,11 +66,11 @@
               volumes:
                 - /etc/timezone:/etc/timezone:ro
                 - /etc/localtime:/etc/localtime:ro
-                - ./main.cf:/etc/postfix/main.cf:ro
-                - ./master.cf:/etc/postfix/master.cf:ro
-                - ./conf:/etc/postfix/conf
-                - ./spool:/var/spool/postfix
-                - ./sasl2:/etc/sasl2
+                - {{ conf_dir }}/main.cf:/etc/postfix/main.cf:ro
+                - {{ conf_dir }}/master.cf:/etc/postfix/master.cf:ro
+                - {{ conf_dir }}/conf:/etc/postfix/conf
+                - {{ conf_dir }}/spool:/var/spool/postfix
+                - {{ conf_dir }}/sasl2:/etc/sasl2
           networks:
             default:
               name: build
diff --git a/setups/dockerfile b/setups/dockerfile
index e691d1a..d69a4b8 100644
--- a/setups/dockerfile
+++ b/setups/dockerfile
@@ -3,6 +3,6 @@ FROM semaphoreui/semaphore:latest
 
 USER root
 RUN apk add --no-cache python3 py3-pip
-RUN pip install pywinrm jmespath netaddr passlib requests matrix_client
+RUN pip install pywinrm jmespath netaddr passlib requests matrix_client docker
 
 USER semaphore