Dockerfile: revert the revert of #11818 and #11819

[iMichka]

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same change?
• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your changes? Here's an example.
• Have you successfully run brew style with your changes locally?
• Have you successfully run brew typecheck with your changes locally?
• Have you successfully run brew tests with your changes locally?

---

The better fix was Homebrew/homebrew-test-bot#654

[BrewTestBot]

Review period skipped due to critical label.

[iMichka]

cc @dawidd6 and @sudoforge

[sudoforge]

Yep, Homebrew/homebrew-test-bot#654 is the right solution. Thanks for the ping!