add more rules from docker docs, tweak dockerfile