1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-09 00:46:25 +00:00

remove kopano-server pid from goss checks (#437)

* remove kopano-server pid from goss checks
* fix download location of trivy
This commit is contained in:
Felix Bartels 2020-09-02 14:08:34 +02:00 committed by GitHub
parent d6c3896b4e
commit 6379f025a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions

View File

@ -9,7 +9,7 @@ GOSS_VERSION=0.3.11
HADOLINT_VERSION=1.17.6 HADOLINT_VERSION=1.17.6
REG_VERSION=0.16.1 REG_VERSION=0.16.1
SHELLCHECK_VERSION=0.7.1 SHELLCHECK_VERSION=0.7.1
TRIVY_VERSION=0.6.0 TRIVY_VERSION=0.11.0
progname=$(basename "$0") progname=$(basename "$0")
tempdir=$(mktemp -d "/tmp/$progname.XXXXXX") tempdir=$(mktemp -d "/tmp/$progname.XXXXXX")
@ -31,7 +31,7 @@ if ! command -v docker-compose > /dev/null; then
fi fi
if ! command -v trivy > /dev/null; then if ! command -v trivy > /dev/null; then
wget https://github.com/knqyf263/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
sudo tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz -C /usr/local/bin trivy sudo tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz -C /usr/local/bin trivy
fi fi

View File

@ -1,4 +1,5 @@
file: file:
# TODO how to make path dynamic?
/kopano/data/attachments/: /kopano/data/attachments/:
exists: true exists: true
mode: "0755" mode: "0755"
@ -11,12 +12,6 @@ file:
owner: kopano owner: kopano
group: kopano group: kopano
filetype: socket filetype: socket
/run/kopano/server.pid:
exists: true
mode: "0644"
owner: kopano
group: kopano
filetype: file
/run/kopano/server.sock: /run/kopano/server.sock:
exists: true exists: true
mode: "0666" mode: "0666"
@ -27,9 +22,11 @@ process:
kopano-server: kopano-server:
running: true running: true
http: http:
# TODO what if plain http is deactivated? (or uses a different port?)
http://localhost:236: http://localhost:236:
status: 405 status: 405
timeout: 5000 timeout: 5000
# TODO what if ssl is deactivated? (or uses a different port?)
https://localhost:237: https://localhost:237:
status: 405 status: 405
allow-insecure: true allow-insecure: true