1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-08 08:26:13 +00:00

remove container name from images not depending on it (not being able to scale up) (#125)

fixes #124

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2019-03-23 09:51:49 +01:00 committed by GitHub
parent 6aff14c021
commit f48e1b2084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,7 +3,6 @@ version: "3.5"
services: services:
web: web:
image: ${docker_repo:-zokradonh}/kopano_web image: ${docker_repo:-zokradonh}/kopano_web
container_name: ${COMPOSE_PROJECT_NAME}_web
restart: unless-stopped restart: unless-stopped
ports: ports:
- "${CADDY:-2015}:2015" - "${CADDY:-2015}:2015"
@ -29,6 +28,7 @@ services:
ldap: ldap:
image: ${docker_repo:-zokradonh}/kopano_ldap_demo image: ${docker_repo:-zokradonh}/kopano_ldap_demo
restart: unless-stopped
container_name: ${COMPOSE_PROJECT_NAME}_ldap container_name: ${COMPOSE_PROJECT_NAME}_ldap
ports: ports:
- ${LDAPPORT:-389}:389 - ${LDAPPORT:-389}:389
@ -50,20 +50,17 @@ services:
ldap-admin: ldap-admin:
image: osixia/phpldapadmin:0.7.2 image: osixia/phpldapadmin:0.7.2
container_name: ${COMPOSE_PROJECT_NAME}_ldap-admin
depends_on: depends_on:
- ldap - ldap
environment: environment:
- PHPLDAPADMIN_LDAP_HOSTS=ldap - PHPLDAPADMIN_LDAP_HOSTS=ldap
- PHPLDAPADMIN_HTTPS=false - PHPLDAPADMIN_HTTPS=false
command: -l debug
networks: networks:
- ldap-net - ldap-net
- web-net - web-net
password-self-service: password-self-service:
image: tiredofit/self-service-password:3.0 image: tiredofit/self-service-password:3.0
container_name: ${COMPOSE_PROJECT_NAME}_password-self-service
domainname: ${LDAP_DOMAIN} domainname: ${LDAP_DOMAIN}
depends_on: depends_on:
- ldap - ldap
@ -182,7 +179,6 @@ services:
kopano_ssl: kopano_ssl:
image: ${docker_repo:-zokradonh}/kopano_ssl image: ${docker_repo:-zokradonh}/kopano_ssl
container_name: ${COMPOSE_PROJECT_NAME}_ssl
environment: environment:
- FQDN=${FQDN} - FQDN=${FQDN}
- PKI_COUNTRY=NL - PKI_COUNTRY=NL
@ -331,7 +327,6 @@ services:
kopano_dagent: kopano_dagent:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_dagent
depends_on: depends_on:
- kopano_server - kopano_server
volumes: volumes:
@ -349,7 +344,6 @@ services:
kopano_spooler: kopano_spooler:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_spooler
hostname: spooler hostname: spooler
domainname: ${LDAP_DOMAIN} domainname: ${LDAP_DOMAIN}
depends_on: depends_on:
@ -371,7 +365,6 @@ services:
kopano_gateway: kopano_gateway:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_gateway
depends_on: depends_on:
- kopano_server - kopano_server
ports: ports:
@ -391,7 +384,6 @@ services:
kopano_ical: kopano_ical:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_ical
depends_on: depends_on:
- kopano_server - kopano_server
volumes: volumes:
@ -409,7 +401,6 @@ services:
kopano_monitor: kopano_monitor:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_monitor
depends_on: depends_on:
- kopano_server - kopano_server
volumes: volumes:
@ -442,7 +433,6 @@ services:
kopano_konnect: kopano_konnect:
image: ${docker_repo:-zokradonh}/kopano_konnect:${KONNECT_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_konnect:${KONNECT_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_konnect
command: wrapper.sh command: wrapper.sh
depends_on: depends_on:
- kopano_server - kopano_server
@ -462,7 +452,6 @@ services:
kopano_playground: kopano_playground:
image: ${docker_repo:-zokradonh}/kopano_playground image: ${docker_repo:-zokradonh}/kopano_playground
container_name: ${COMPOSE_PROJECT_NAME}_playground
depends_on: depends_on:
- kopano_kapi - kopano_kapi
- kopano_konnect - kopano_konnect
@ -472,7 +461,6 @@ services:
kopano_kwmserver: kopano_kwmserver:
image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_kwmserver
command: wrapper.sh command: wrapper.sh
depends_on: depends_on:
- kopano_kapi - kopano_kapi
@ -491,7 +479,6 @@ services:
kopano_meet: kopano_meet:
image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
container_name: ${COMPOSE_PROJECT_NAME}_meet
environment: environment:
- SERVICE_TO_START=meet - SERVICE_TO_START=meet
- KCCONF_MEET_guests_enabled=true - KCCONF_MEET_guests_enabled=true