Unified values of CI_BASE_IMAGE and BUILDER_IMAGE docker args
Probably some docker engine updates involved errors in part of Dockerfile not directly referenced by built --target. This MR unifies args usage and eliminates such problems.
Related to hive!1163 (merged)
Edited by Bartek Wrona