docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify setup templates to allow for DOCKER_ORG and VERSION override. (Needed for Travis)

Browse Source
This commit is contained in:
Tim Möhlmann
2018-10-25 16:35:08 +03:00
parent 928fbb372d
commit 72e931f4b4
4 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -5,7 +5,7 @@ addons:
packages: packages:
- docker-ce - docker-ce
env: env:
- VERSION=$TRAVIS_BRANCH - MAILU_VERSION=$TRAVIS_BRANCH
language: python language: python
python: python:
- "3.6" - "3.6"
@@ -13,10 +13,9 @@ install:
- pip install -r tests/requirements.txt - pip install -r tests/requirements.txt
script: script:
# Default to mailu for DOCKER_ORG
- if [ -z "$DOCKER_ORG" ]; then export DOCKER_ORG="mailu"; fi
- docker-compose -f tests/build.yml build - docker-compose -f tests/build.yml build
- python tests/compose/test.py # test.py, test name and timeout between start and tests.
- python tests/compose/test.py core 1
deploy: deploy:
provider: script provider: script

18
setup/flavors/compose/docker-compose.yml
View File

@@ -16,7 +16,7 @@ services:
# Core services # Core services
front: front:
image: mailu/nginx:{{ version }} image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
logging: logging:
@@ -34,7 +34,7 @@ services:
- "{{ root }}/certs:/certs" - "{{ root }}/certs:/certs"
admin: admin:
image: mailu/admin:{{ version }} image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
{% if not admin_enabled %} {% if not admin_enabled %}
@@ -48,7 +48,7 @@ services:
- redis - redis
imap: imap:
image: mailu/dovecot:{{ version }} image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -58,7 +58,7 @@ services:
- front - front
smtp: smtp:
image: mailu/postfix:{{ version }} image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -69,7 +69,7 @@ services:
# Optional services # Optional services
{% if antispam_enabled %} {% if antispam_enabled %}
antispam: antispam:
image: mailu/rspamd:{{ version }} image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -82,7 +82,7 @@ services:
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: mailu/clamav:{{ version }} image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -91,7 +91,7 @@ services:
{% if webdav_enabled %} {% if webdav_enabled %}
webdav: webdav:
image: mailu/radicale:{{ version }} image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
@@ -100,7 +100,7 @@ services:
{% if fetchmail_enabled %} {% if fetchmail_enabled %}
fetchmail: fetchmail:
image: mailu/fetchmail:{{ version }} image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
{% endif %} {% endif %}
@@ -108,7 +108,7 @@ services:
# Webmail # Webmail
{% if webmail_type != 'none' %} {% if webmail_type != 'none' %}
webmail: webmail:
image: mailu/{{ webmail_type }}:{{ version }} image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:

18
setup/flavors/stack/docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
# Core services # Core services
front: front:
image: mailu/nginx:{{ version }} image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
logging: logging:
driver: {{ log_driver or 'json-file' }} driver: {{ log_driver or 'json-file' }}
@@ -31,7 +31,7 @@ services:
replicas: {{ front_replicas }} replicas: {{ front_replicas }}
admin: admin:
image: mailu/admin:{{ version }} image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
{% if not admin_enabled %} {% if not admin_enabled %}
ports: ports:
@@ -44,7 +44,7 @@ services:
replicas: {{ admin_replicas }} replicas: {{ admin_replicas }}
imap: imap:
image: mailu/dovecot:{{ version }} image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
environment: environment:
# Default to 10.0.1.0/24 # Default to 10.0.1.0/24
@@ -56,7 +56,7 @@ services:
replicas: {{ imap_replicas }} replicas: {{ imap_replicas }}
smtp: smtp:
image: mailu/postfix:{{ version }} image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
environment: environment:
- POD_ADDRESS_RANGE={{ subnet }} - POD_ADDRESS_RANGE={{ subnet }}
@@ -68,7 +68,7 @@ services:
# Optional services # Optional services
{% if antispam_enabled %} {% if antispam_enabled %}
antispam: antispam:
image: mailu/rspamd:{{ version }} image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
environment: environment:
- POD_ADDRESS_RANGE={{ subnet }} - POD_ADDRESS_RANGE={{ subnet }}
@@ -82,7 +82,7 @@ services:
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: mailu/clamav:{{ version }} image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/filter:/data" - "{{ root }}/filter:/data"
@@ -92,7 +92,7 @@ services:
{% if webdav_enabled %} {% if webdav_enabled %}
webdav: webdav:
image: mailu/none:{{ version }} image: ${DOCKER_ORG:-mailu}/none:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/dav:/data" - "{{ root }}/dav:/data"
@@ -102,7 +102,7 @@ services:
{% if fetchmail_enabled %} {% if fetchmail_enabled %}
fetchmail: fetchmail:
image: mailu/fetchmail:{{ version }} image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/data:/data" - "{{ root }}/data:/data"
@@ -112,7 +112,7 @@ services:
{% if webmail_type != 'none' %} {% if webmail_type != 'none' %}
webmail: webmail:
image: mailu/roundcube:{{ version }} image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/webmail:/data" - "{{ root }}/webmail:/data"

26
tests/build.yml
View File

@@ -3,54 +3,54 @@ version: '3'
services: services:
front: front:
image: ${DOCKER_ORG:-mailu}/nginx:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-local}
build: ../core/nginx build: ../core/nginx
imap: imap:
image: ${DOCKER_ORG:-mailu}/dovecot:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-local}
build: ../core/dovecot build: ../core/dovecot
smtp: smtp:
image: ${DOCKER_ORG:-mailu}/postfix:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/postfix:${MAILU_VERSION:-local}
build: ../core/postfix build: ../core/postfix
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-local}
build: ../services/rspamd build: ../services/rspamd
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-local}
build: ../optional/clamav build: ../optional/clamav
webdav: webdav:
image: ${DOCKER_ORG:-mailu}/radicale:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/radicale:${MAILU_VERSION:-local}
build: ../optional/radicale build: ../optional/radicale
admin: admin:
image: ${DOCKER_ORG:-mailu}/admin:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-local}
build: ../core/admin build: ../core/admin
roundcube: roundcube:
image: ${DOCKER_ORG:-mailu}/roundcube:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-local}
build: ../webmails/roundcube build: ../webmails/roundcube
rainloop: rainloop:
image: ${DOCKER_ORG:-mailu}/rainloop:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/rainloop:${MAILU_VERSION:-local}
build: ../webmails/rainloop build: ../webmails/rainloop
fetchmail: fetchmail:
image: ${DOCKER_ORG:-mailu}/fetchmail:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/fetchmail:${MAILU_VERSION:-local}
build: ../services/fetchmail build: ../services/fetchmail
none: none:
image: ${DOCKER_ORG:-mailu}/none:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/none:${MAILU_VERSION:-local}
build: ../core/none build: ../core/none
docs: docs:
image: ${DOCKER_ORG:-mailu}/docs:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/docs:${MAILU_VERSION:-local}
build: ../docs build: ../docs
setup: setup:
image: ${DOCKER_ORG:-mailu}/setup:${VERSION:-local} image: ${DOCKER_ORG:-mailu}/setup:${MAILU_VERSION:-local}
build: ../setup build: ../setup