flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-06 23:46:24 +00:00
Code Issues Releases Wiki Activity

Add linting for yaml files (#186)

Browse Source 
* rename check-scripts target to lint
* install yamllint through pip on travis
* add yamllint config, do not fail on too long lines
* fix yaml linting errors
* remove circular dependency
This commit is contained in:
Felix Bartels 2019-06-19 18:08:36 +02:00 committed by GitHub
parent e4983a96a2
commit 4d2cffbe09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 92 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@ -2,12 +2,12 @@ sudo: required
language: bash language: bash
env: env:
global: global:
- HADOLINT_VERSION=1.16.3 - HADOLINT_VERSION=1.16.3
- DOCKER_COMPOSE_VERSION=1.23.2 - DOCKER_COMPOSE_VERSION=1.23.2
- TRIVY_VERSION=0.1.1 - TRIVY_VERSION=0.1.1
- secure: iSwQW1ytg9/ntqlF1nMzYcg0ouT3TifuAzauu//vWMiRfRthAi0bLuz3nBvlkQwtUk/iF3+smdOtwvjlmW7wWdwdf9tzpsyVKVYcS/+1MbxnGXE4OyNLkUJ7KASRk4otfsujMDNO95q/m04sOLJ721dsOWR6dv+5MNJ3LrushsbFfuStHmM1cNyUR6NuPy4g/x4oppv23rbSXU/qS7ULUsOTEUuTsmgvvKQRZiiOFaOgzeHCIEdrX6Dpsx6DPtYQ5az88q6CrkkTaw7GhP1qBXAGNX03NeHPd7YZvsgePoZJEJ/jTRsZVx9LxwkmnVTJDqthgqTGXTBJIvow3oICjKLf/DhURvkHaAJPu+Nxyvxo2xgYaa0Zbau5fmhEblyKU8Q9g+ZXsdjC5uy/vqJjg1rZD9BZjbKXRP9nb5VpxLdzcWE80XpEj7tHMfF4bN7LvIHZ81wINtZdZeFLVW53YzIO0NAoRCDk1SmR6N11T1uE8FrBzO80oETUMud2zYTx9U+J0m/qsNK+fOz2GtxwI3mlU0/bgVlcFE6865lOPuRwcTOhDwGqeWsLbBYsYXaJhqktn6XKiZ/BEeJLx6Z/CvyNXbzexn1i4wyVZAK7xxkhjxFPnWFU9WPan4ibkGLsS9sFsUTLVa4oBszkTO6q5NU7vIycdgJpfZlkdL2V0EA= - secure: iSwQW1ytg9/ntqlF1nMzYcg0ouT3TifuAzauu//vWMiRfRthAi0bLuz3nBvlkQwtUk/iF3+smdOtwvjlmW7wWdwdf9tzpsyVKVYcS/+1MbxnGXE4OyNLkUJ7KASRk4otfsujMDNO95q/m04sOLJ721dsOWR6dv+5MNJ3LrushsbFfuStHmM1cNyUR6NuPy4g/x4oppv23rbSXU/qS7ULUsOTEUuTsmgvvKQRZiiOFaOgzeHCIEdrX6Dpsx6DPtYQ5az88q6CrkkTaw7GhP1qBXAGNX03NeHPd7YZvsgePoZJEJ/jTRsZVx9LxwkmnVTJDqthgqTGXTBJIvow3oICjKLf/DhURvkHaAJPu+Nxyvxo2xgYaa0Zbau5fmhEblyKU8Q9g+ZXsdjC5uy/vqJjg1rZD9BZjbKXRP9nb5VpxLdzcWE80XpEj7tHMfF4bN7LvIHZ81wINtZdZeFLVW53YzIO0NAoRCDk1SmR6N11T1uE8FrBzO80oETUMud2zYTx9U+J0m/qsNK+fOz2GtxwI3mlU0/bgVlcFE6865lOPuRwcTOhDwGqeWsLbBYsYXaJhqktn6XKiZ/BEeJLx6Z/CvyNXbzexn1i4wyVZAK7xxkhjxFPnWFU9WPan4ibkGLsS9sFsUTLVa4oBszkTO6q5NU7vIycdgJpfZlkdL2V0EA=
- secure: kj/KcPck6RHSQdcN29+OoxSufHX8KgMXs/ekVUsgcXfWb8iwo0UbfGwyPf+oy1vvjO65e0xsdGHN6Vk++opJT1qaAMpIInfh3+otXmDrT4Uq0s+vBkyQ/EPNeTy6oWK28y5+IVrR3Nd4FMK8CQ4FKzqKAAOQDkusI1182tRL9wDPnCbUD92cNcTPh7aHccSflkBOzw0G6d0v3RFIseOdYMA4DN72YfUV6RHVgOz7PSPmZ9p9lza1Fdbd1fBYoqBapzm3tIWiaU20OkyYNorZzsT+afTTpfHIb5ku+emNCiKDORuX4XQHDiS+PtqDNJRL2WsOsudVf9ckd9wpTkDj5rFnVex7GtS4z47kLDahzNWMQs4gnpDVUi3jbGeU/62EXdiAmuWs0A2kUSPYZwAKVbfIDlp3tAy0dzGivnBfTdN/TYVRm0IDRJZZNp964Tu3rGLazbRCYpGTIYz4KlMRrIN4QJj8JMmvcaOidp/xQJL+MkZTNY653VFHYeu61XEUV3RkGkkhZL967w+VuhkULDppslKExsJzXXX6ITauLu6hqAj+fWrn0WDxn/Km+sx9aJaBNqg4egT8mX5+WeDdoV+3NyODjbYUaEPKSuUkW/Skm+VGlYeyc9apahTSDe1H/W2KUcramkMT17IdPqXTqvlo+HSR97IGoE37OWKdoVM= - secure: kj/KcPck6RHSQdcN29+OoxSufHX8KgMXs/ekVUsgcXfWb8iwo0UbfGwyPf+oy1vvjO65e0xsdGHN6Vk++opJT1qaAMpIInfh3+otXmDrT4Uq0s+vBkyQ/EPNeTy6oWK28y5+IVrR3Nd4FMK8CQ4FKzqKAAOQDkusI1182tRL9wDPnCbUD92cNcTPh7aHccSflkBOzw0G6d0v3RFIseOdYMA4DN72YfUV6RHVgOz7PSPmZ9p9lza1Fdbd1fBYoqBapzm3tIWiaU20OkyYNorZzsT+afTTpfHIb5ku+emNCiKDORuX4XQHDiS+PtqDNJRL2WsOsudVf9ckd9wpTkDj5rFnVex7GtS4z47kLDahzNWMQs4gnpDVUi3jbGeU/62EXdiAmuWs0A2kUSPYZwAKVbfIDlp3tAy0dzGivnBfTdN/TYVRm0IDRJZZNp964Tu3rGLazbRCYpGTIYz4KlMRrIN4QJj8JMmvcaOidp/xQJL+MkZTNY653VFHYeu61XEUV3RkGkkhZL967w+VuhkULDppslKExsJzXXX6ITauLu6hqAj+fWrn0WDxn/Km+sx9aJaBNqg4egT8mX5+WeDdoV+3NyODjbYUaEPKSuUkW/Skm+VGlYeyc9apahTSDe1H/W2KUcramkMT17IdPqXTqvlo+HSR97IGoE37OWKdoVM=
- secure: k5V2o5xIGGQ2vlWaCfWHAn68z7k/FSL8bXgow6/x0svxmsvDxJzRrpnM3xn681ogUEoQP1hQeHWeR0tg88RcDFmjzEObMjVd7Av289YIQ/W6hmFFb+SCa+TmAe49ybPLZA2UNygC/zqH5N6U5iMYsyPrChw4oUv9X9lfDJUz08crRVwffm/JwcEfV1tH722I2WUcEpxKYyqymK9CaO3e2UTXnPaASNOPuZ2v0T3D1lvla+XRNG+JJ6+BJjBRkzMMg584IaBIqGVf9tlImZkGfYmVWUVvBfpuHMSU9OC4CJXBRqy6K/nUlw5bDDsGFbLGA9Tg1qgLzAZsPCSMSCC2Gq0rLxuihudWEJ9e8dnRLIbt+Zxlqa2s7DQ2FTWyofQfR4GL6cD4uSoSh+k9ij6PeJMSEzplaO01Fyh87uRbcVBxwktIXeVuJsBG8uQ2wdWjQ41g4noDHzsV1duJ1nz9b6JRH7Vbp8bKXow3K+EtlFfa9GcD4I64oksbWH+hx+PBBf0qEdUzZnHmw2vEqJyjdlCoQ1k7pX6c9rxzNiKIb8Hsmhu1r7DCNYBYZIZ1pGhVBilxrr9QiU0hGpRsON0QOzTobz6TohW9w+LNgBMPMizLRFi3r14Nqel8GIWcQUP/RBTiXb8Lr+D9oq0oY1Up4QyfEq1SfkJ1yD4qzCOhb5I= - secure: k5V2o5xIGGQ2vlWaCfWHAn68z7k/FSL8bXgow6/x0svxmsvDxJzRrpnM3xn681ogUEoQP1hQeHWeR0tg88RcDFmjzEObMjVd7Av289YIQ/W6hmFFb+SCa+TmAe49ybPLZA2UNygC/zqH5N6U5iMYsyPrChw4oUv9X9lfDJUz08crRVwffm/JwcEfV1tH722I2WUcEpxKYyqymK9CaO3e2UTXnPaASNOPuZ2v0T3D1lvla+XRNG+JJ6+BJjBRkzMMg584IaBIqGVf9tlImZkGfYmVWUVvBfpuHMSU9OC4CJXBRqy6K/nUlw5bDDsGFbLGA9Tg1qgLzAZsPCSMSCC2Gq0rLxuihudWEJ9e8dnRLIbt+Zxlqa2s7DQ2FTWyofQfR4GL6cD4uSoSh+k9ij6PeJMSEzplaO01Fyh87uRbcVBxwktIXeVuJsBG8uQ2wdWjQ41g4noDHzsV1duJ1nz9b6JRH7Vbp8bKXow3K+EtlFfa9GcD4I64oksbWH+hx+PBBf0qEdUzZnHmw2vEqJyjdlCoQ1k7pX6c9rxzNiKIb8Hsmhu1r7DCNYBYZIZ1pGhVBilxrr9QiU0hGpRsON0QOzTobz6TohW9w+LNgBMPMizLRFi3r14Nqel8GIWcQUP/RBTiXb8Lr+D9oq0oY1Up4QyfEq1SfkJ1yD4qzCOhb5I=
services: services:
- docker - docker
before_install: before_install:
@ -19,10 +19,11 @@ before_install:
- sudo chmod +rx /usr/local/bin/hadolint - sudo chmod +rx /usr/local/bin/hadolint
- sudo chmod +rx /usr/local/bin/docker-compose - sudo chmod +rx /usr/local/bin/docker-compose
- sudo apt update && sudo apt install -y expect - sudo apt update && sudo apt install -y expect
- sudo pip install --upgrade pip && sudo pip install yamllint
install: install:
- make check-scripts - make lint
- "./test.exp" - "./test.exp"
- make check-scripts # rerun check-scripts to see if output is different with .env in place - make lint # rerun lint to see if output is different with .env in place
- travis_retry make build-all - travis_retry make build-all
script: script:
- make test-ci - make test-ci

7
.yamllint Normal file
View File

@ -0,0 +1,7 @@
extends: default
rules:
# 80 chars should be enough, but don't fail if a line is longer
line-length:
max: 80
level: warning

3
Makefile
View File

@ -321,10 +321,11 @@ publish-webapp: tag-webapp
publish-zpush: tag-zpush publish-zpush: tag-zpush
component=zpush make publish-container component=zpush make publish-container
check-scripts: lint:
grep -rIl '^#![[:blank:]]*/bin/\(bash\|sh\|zsh\)' \ grep -rIl '^#![[:blank:]]*/bin/\(bash\|sh\|zsh\)' \
--exclude-dir=.git --exclude=*.sw? \ --exclude-dir=.git --exclude=*.sw? \
| xargs shellcheck -x | xargs shellcheck -x
git ls-files --exclude='*.yml' --ignored | xargs --max-lines=1 yamllint
# List files which name starts with 'Dockerfile' # List files which name starts with 'Dockerfile'
# eg. Dockerfile, Dockerfile.build, etc. # eg. Dockerfile, Dockerfile.build, etc.
git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 hadolint git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 hadolint

90
docker-compose.yml
View File

@ -13,18 +13,18 @@ services:
- FQDN=${FQDN?err} - FQDN=${FQDN?err}
command: wrapper.sh command: wrapper.sh
cap_drop: cap_drop:
- ALL - ALL
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- CHOWN - CHOWN
- SETGID - SETGID
- SETUID - SETUID
volumes: volumes:
- web:/.kweb - web:/.kweb
networks: networks:
web-net: web-net:
aliases: aliases:
- ${FQDNCLEANED?err} - ${FQDNCLEANED?err}
ldap: ldap:
image: ${docker_repo:-zokradonh}/${LDAP_CONTAINER:-kopano_ldap_demo}:${LDAP_VERSION:-latest} image: ${docker_repo:-zokradonh}/${LDAP_CONTAINER:-kopano_ldap_demo}:${LDAP_VERSION:-latest}
@ -93,9 +93,9 @@ services:
expose: expose:
- "80" - "80"
networks: networks:
- web-net # provide web-frontend - web-net # provide web-frontend
- ldap-net # access ldap user base and write passwords - ldap-net # access ldap user base and write passwords
- kopano-net # send mail directly to mailstack - kopano-net # send mail directly to mailstack
mail: mail:
image: tvial/docker-mailserver:release-v6.1.0 image: tvial/docker-mailserver:release-v6.1.0
@ -149,7 +149,7 @@ services:
networks: networks:
- kopano-net - kopano-net
- ldap-net - ldap-net
#dns: 1.1.1.1 # using Google DNS can lead to lookup errors uncomment this option and #dns: 1.1.1.1 # using Google DNS can lead to lookup errors uncomment this option and
# set to the ip of a trusted dns service (Cloudflare is given as an example). # set to the ip of a trusted dns service (Cloudflare is given as an example).
# See https://github.com/zokradonh/kopano-docker/issues/52 for more information. # See https://github.com/zokradonh/kopano-docker/issues/52 for more information.
cap_add: cap_add:
@ -212,7 +212,7 @@ services:
- KCCONF_SERVER_SERVER_SSL_CA_FILE=/kopano/ssl/ca.pem - KCCONF_SERVER_SERVER_SSL_CA_FILE=/kopano/ssl/ca.pem
- KCCONF_SERVER_SERVER_NAME=Kopano - KCCONF_SERVER_SERVER_NAME=Kopano
- KCCONF_SERVER_SSLKEYS_PATH=/kopano/ssl/clients - KCCONF_SERVER_SSLKEYS_PATH=/kopano/ssl/clients
- KCCONF_SERVER_PROXY_HEADER=* # delete line if webapp is not behind reverse proxy - KCCONF_SERVER_PROXY_HEADER=* # delete line if webapp is not behind reverse proxy
- KCCONF_SERVER_SYSTEM_EMAIL_ADDRESS=${POSTMASTER_ADDRESS} - KCCONF_SERVER_SYSTEM_EMAIL_ADDRESS=${POSTMASTER_ADDRESS}
- KCCONF_LDAP_LDAP_URI=${LDAP_SERVER} - KCCONF_LDAP_LDAP_URI=${LDAP_SERVER}
- KCCONF_LDAP_LDAP_BIND_USER=${LDAP_BIND_DN} - KCCONF_LDAP_LDAP_BIND_USER=${LDAP_BIND_DN}
@ -313,7 +313,6 @@ services:
container_name: ${COMPOSE_PROJECT_NAME}_kdav container_name: ${COMPOSE_PROJECT_NAME}_kdav
depends_on: depends_on:
- kopano_server - kopano_server
container_name: ${COMPOSE_PROJECT_NAME}_kdav
volumes: volumes:
- kopanossl/:/kopano/ssl - kopanossl/:/kopano/ssl
- kopanosocket/:/run/kopano - kopanosocket/:/run/kopano
@ -437,65 +436,64 @@ services:
image: ${docker_repo:-zokradonh}/kopano_konnect:${KONNECT_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_konnect:${KONNECT_VERSION:-latest}
command: wrapper.sh command: wrapper.sh
depends_on: depends_on:
- kopano_server - kopano_ssl
- web
# to be useful Konnect also need a running kopano_server, but this dependency cannot be added here since this would be a circular dependency
volumes: volumes:
- kopanossl/:/kopano/ssl - kopanossl/:/kopano/ssl
- kopanosocket/:/run/kopano - kopanosocket/:/run/kopano
depends_on:
- kopano_ssl
- web
environment: environment:
- FQDN=${FQDN} - FQDN=${FQDN}
- allow_client_guests=yes - allow_client_guests=yes
- allow_dynamic_client_registration=yes - allow_dynamic_client_registration=yes
env_file: env_file:
- kopano_konnect.env - kopano_konnect.env
networks: networks:
- kopano-net - kopano-net
- web-net - web-net
kopano_playground: kopano_playground:
image: ${docker_repo:-zokradonh}/kopano_playground image: ${docker_repo:-zokradonh}/kopano_playground
depends_on: depends_on:
- kopano_kapi - kopano_kapi
- kopano_konnect - kopano_konnect
networks: networks:
- kopano-net - kopano-net
- web-net - web-net
kopano_kwmserver: kopano_kwmserver:
image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest}
command: wrapper.sh command: wrapper.sh
depends_on: depends_on:
- kopano_kapi - kopano_kapi
- kopano_konnect - kopano_konnect
environment: environment:
- INSECURE=${INSECURE} - INSECURE=${INSECURE}
- oidc_issuer_identifier=https://${FQDN} - oidc_issuer_identifier=https://${FQDN}
- enable_guest_api=yes - enable_guest_api=yes
- public_guest_access_regexp=^group/public/.* - public_guest_access_regexp=^group/public/.*
env_file: env_file:
- kopano_kwmserver.env - kopano_kwmserver.env
volumes: volumes:
- kopanossl/:/kopano/ssl - kopanossl/:/kopano/ssl
networks: networks:
- web-net - web-net
kopano_meet: kopano_meet:
image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
environment: environment:
- SERVICE_TO_START=meet - SERVICE_TO_START=meet
- KCCONF_MEET_guests_enabled=true - KCCONF_MEET_guests_enabled=true
- KCCONF_MEET_disableFullGAB=false - KCCONF_MEET_disableFullGAB=false
env_file: env_file:
- kopano_meet.env - kopano_meet.env
depends_on: depends_on:
- kopano_kapi - kopano_kapi
- kopano_konnect - kopano_konnect
- kopano_kwmserver - kopano_kwmserver
- web - web
networks: networks:
- web-net - web-net
kopano_scheduler: kopano_scheduler:
image: ${docker_repo:-zokradonh}/kopano_scheduler:${SCHEDULER_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_scheduler:${SCHEDULER_VERSION:-latest}

36
examples/meet-kopano.yml
View File

@ -14,18 +14,18 @@ services:
- FQDN=${FQDN?err} - FQDN=${FQDN?err}
command: wrapper.sh command: wrapper.sh
cap_drop: cap_drop:
- ALL - ALL
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- CHOWN - CHOWN
- SETGID - SETGID
- SETUID - SETUID
volumes: volumes:
- web:/.kweb - web:/.kweb
networks: networks:
web-net: web-net:
aliases: aliases:
- ${FQDNCLEANED?err} - ${FQDNCLEANED?err}
kopano_ssl: kopano_ssl:
image: ${docker_repo:-zokradonh}/kopano_ssl image: ${docker_repo:-zokradonh}/kopano_ssl
@ -73,35 +73,35 @@ services:
- /etc/kopano/ssl:/kopano/ssl - /etc/kopano/ssl:/kopano/ssl
- /run/kopano:/run/kopano - /run/kopano:/run/kopano
environment: environment:
- FQDN=${FQDN} - FQDN=${FQDN}
networks: networks:
- web-net - web-net
kopano_kwmserver: kopano_kwmserver:
image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest}
container_name: kopano_kwmserver container_name: kopano_kwmserver
command: wrapper.sh command: wrapper.sh
environment: environment:
- INSECURE=${INSECURE} - INSECURE=${INSECURE}
- oidc_issuer_identifier=https://${FQDN} - oidc_issuer_identifier=https://${FQDN}
volumes: volumes:
- /etc/kopano/ssl:/kopano/ssl - /etc/kopano/ssl:/kopano/ssl
networks: networks:
- web-net - web-net
kopano_meet: kopano_meet:
image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
container_name: kopano_meet container_name: kopano_meet
environment: environment:
- SERVICE_TO_START=meet - SERVICE_TO_START=meet
- KCCONF_KWEBD_TLS=no - KCCONF_KWEBD_TLS=no
depends_on: depends_on:
- kopano_kapi - kopano_kapi
- kopano_konnect - kopano_konnect
- kopano_kwmserver - kopano_kwmserver
- web - web
networks: networks:
- web-net - web-net
volumes: volumes:
web: web:

12
examples/webapp.yml
View File

@ -14,18 +14,18 @@ services:
- FQDN=${FQDN} - FQDN=${FQDN}
command: wrapper.sh command: wrapper.sh
cap_drop: cap_drop:
- ALL - ALL
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- CHOWN - CHOWN
- SETGID - SETGID
- SETUID - SETUID
volumes: volumes:
- web:/.kweb - web:/.kweb
networks: networks:
web-net: web-net:
aliases: aliases:
- ${FQDN} - ${FQDN}
kopano_webapp: kopano_webapp:
image: ${docker_repo:-zokradonh}/kopano_webapp:${WEBAPP_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_webapp:${WEBAPP_VERSION:-latest}