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