Merge branch 'master' into docker-secrets

.gitlab-ci.yml

README.md

cache/run-httpd.sh

client/html/505e00b9451ba872d9e7.worker.js

client/html/prism.js

config/vhr18_index-dev.html

config/vhr18_index-ops.html

data/.gitkeep

docker-compose.base.ops.yml

docker-compose.dem.dev.yml

docker-compose.dem.ops.yml

docker-compose.emg.dev.yml

docker-compose.emg.ops.yml

docker-compose.logging.dev.yml

docker-compose.logging.ops.yml

docker-compose.logging.yml

docker-compose.vhr18.dev.yml

docker-compose.vhr18.ops.yml

docker-compose.vhr18.yml

fluentd/Dockerfile