improve docker support