This PR cherry picks changes from #687 to get the build passing.
I believe those changes should be safe and more correct anyway.
If we want to use old versions of build Dockerfiles, that will require more work since I noticed we don't store old tags so those images would need to be re-build and tagged accordingly.
This PR cherry picks changes from #687 to get the build passing.
I believe those changes should be safe and more correct anyway.
If we want to use old versions of build Dockerfiles, that will require more work since I noticed we don't store old tags so those images would need to be re-build and tagged accordingly.