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

Further introduction of the DOCKER_ORG variable

Browse Source
This commit is contained in:
Tim Möhlmann
2018-10-05 12:52:19 +03:00
parent 5987703631
commit 3224a8ecad
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compose/core.env
View File

@@ -121,7 +121,7 @@ WEBSITE=https://mailu.io
################################### ###################################
# Docker-compose project name, this will prepended to containers names. # Docker-compose project name, this will prepended to containers names.
COMPOSE_PROJECT_NAME=mailu #COMPOSE_PROJECT_NAME=mailu
# Default password scheme used for newly created accounts and changed passwords # Default password scheme used for newly created accounts and changed passwords
# (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) # (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)

18
tests/compose/run.yml
View File

@@ -3,7 +3,7 @@ version: '2'
services: services:
front: front:
image: mailu/nginx:$VERSION image: $DOCKER_ORG/nginx:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
ports: ports:
@@ -26,7 +26,7 @@ services:
- "$ROOT/redis:/data" - "$ROOT/redis:/data"
imap: imap:
image: mailu/dovecot:$VERSION image: $DOCKER_ORG/dovecot:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
@@ -37,7 +37,7 @@ services:
- front - front
smtp: smtp:
image: mailu/postfix:$VERSION image: $DOCKER_ORG/postfix:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
@@ -47,7 +47,7 @@ services:
- front - front
antispam: antispam:
image: mailu/rspamd:$VERSION image: $DOCKER_ORG/rspamd:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
@@ -58,21 +58,21 @@ services:
- front - front
antivirus: antivirus:
image: mailu/$ANTIVIRUS:$VERSION image: $DOCKER_ORG/$ANTIVIRUS:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
- "$ROOT/filter:/data" - "$ROOT/filter:/data"
webdav: webdav:
image: mailu/$WEBDAV:$VERSION image: $DOCKER_ORG/$WEBDAV:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
- "$ROOT/dav:/data" - "$ROOT/dav:/data"
admin: admin:
image: mailu/admin:$VERSION image: $DOCKER_ORG/admin:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
@@ -83,7 +83,7 @@ services:
- redis - redis
webmail: webmail:
image: "mailu/$WEBMAIL:$VERSION" image: "$DOCKER_ORG/$WEBMAIL:$VERSION"
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:
@@ -92,7 +92,7 @@ services:
- imap - imap
fetchmail: fetchmail:
image: mailu/fetchmail:$VERSION image: $DOCKER_ORG/fetchmail:$VERSION
restart: 'no' restart: 'no'
env_file: $PWD/.env env_file: $PWD/.env
volumes: volumes:

30
tests/compose/test-script.sh
View File

@@ -1,36 +1,36 @@
#!/bin/bash #!/bin/bash
containers=( containers=(
mailu_webmail_1 webmail_1
mailu_imap_1 imap_1
mailu_smtp_1 smtp_1
mailu_antispam_1 antispam_1
mailu_admin_1 admin_1
mailu_redis_1 redis_1
mailu_antivirus_1 antivirus_1
mailu_webdav_1 webdav_1
# mailu_fetchmail_1 # fetchmail_1
mailu_front_1 front_1
) )
containers_check() { containers_check() {
STATUS=0 STATUS=0
for container in "${containers[@]}"; do for container in "${containers[@]}"; do
echo "Checking $container" echo "Checking ${DOCKER_ORG}_${container}"
docker inspect $container | grep '"Status": "running"' || STATUS=1 docker inspect "${DOCKER_ORG}_${container}" | grep '"Status": "running"' || STATUS=1
done done
return $STATUS return $STATUS
} }
container_logs() { container_logs() {
for container in "${containers[@]}"; do for container in "${containers[@]}"; do
echo "Showing logs for $container" echo "Showing logs for ${DOCKER_ORG}_${container}"
docker container logs $container docker container logs "${DOCKER_ORG}_${container}"
done done
} }
for file in tests/compose/*.env ; do for file in tests/compose/*.env ; do
cp $file .env cp $file .env
docker-compose -f tests/compose/run.yml up -d docker-compose -f tests/compose/run.yml -p $DOCKER_ORG up -d
sleep 1m sleep 1m
docker ps docker ps
container_logs container_logs