# Conflicts:
#   .gitlab-ci.yml

added timezone env to avoid confusion for cron jobs etc

Merge branch 'played-around' of https://gitlab.cl.uni-heidelberg.de/tmueller/clspigot-docker into played-around

Merge branch 'played-around' of https://gitlab.cl.uni-heidelberg.de/tmueller/clspigot-docker into played-around

Merge branch 'played-around' of https://gitlab.cl.uni-heidelberg.de/tmueller/clspigot-docker into played-around

syntax

adding ENV for easier access from host users (should be non-roots) but still defaults to 61000 if not specified

fixed tabs with spaces again xD

tests für healtcheck, backup und log, letzeres