craig[bot] and awoods187 Merge #27615
27615: Update Dockerfile r=a-robinson a=awoods187



Co-authored-by: Andy Woods <andy@cockroachlabs.com>
Latest commit faabc77 Jul 17, 2018