Cleanup and centralize ngen-related images

docker/main/docker-build.yml

@@ -65,6 +65,7 @@ services:
     image: ${DOCKER_INTERNAL_REGISTRY:?}/ngen:${NGEN_VERSION:-latest}
     build:
       context: ./ngen
+      target: ngen_worker
       args:
         REPO_URL: ${NGEN_REPO_URL?No NGen repo url configured}
         BRANCH: ${NGEN_BRANCH?No NGen branch configured}
@@ -83,7 +84,8 @@ services:
   ngen-partitioner:
     image: ${DOCKER_INTERNAL_REGISTRY:?}/${DOCKER_PARTITIONER_IMAGE:-ngen-partitioner}
     build:
-      context: ./ngen-partitioner
+      context: ./ngen
+      target: partitioner_image
       args:
         REPO_URL: ${NGEN_REPO_URL?No NGen repo url configured}
         BRANCH: ${NGEN_BRANCH?No NGen branch configured}
@@ -97,16 +99,16 @@ services:
   ngen-calibration:
     image: ${DOCKER_INTERNAL_REGISTRY:?}/ngen-calibration:${NGEN_CAL_IMAGE_TAG:-latest}
     build:
-      context: ./ngen-calibration
+      context: ./ngen
+      target: ngen_cal_worker
       args:
-        BASE_NGEN_IMAGE_TAG: ${NGEN_CAL_BASE_IMAGE_TAG:-latest}
-        #REPO_URL: ${NGEN_REPO_URL?No NGen repo url configured}
+        REPO_URL: ${NGEN_REPO_URL?No NGen repo url configured}
         NGEN_CAL_BRANCH: ${NGEN_CAL_BRANCH:-master}
         NGEN_CAL_COMMIT: ${NGEN_CAL_COMMIT}
-        #TROUTE_REPO_URL: ${TROUTE_REPO_URL?No t-route repo url configured}
-        #TROUTE_BRANCH: ${TROUTE_BRANCH?No t-route branch configured}
-        #TROUTE_COMMIT: ${TROUTE_COMMIT}
-        #BUILD_PARALLEL_JOBS: ${NGEN_BUILD_PARALLEL_JOBS:-2}
+        TROUTE_REPO_URL: ${TROUTE_REPO_URL?No t-route repo url configured}
+        TROUTE_BRANCH: ${TROUTE_BRANCH?No t-route branch configured}
+        TROUTE_COMMIT: ${TROUTE_COMMIT}
+        BUILD_PARALLEL_JOBS: ${NGEN_BUILD_PARALLEL_JOBS:-2}
         DOCKER_INTERNAL_REGISTRY: ${DOCKER_INTERNAL_REGISTRY:?}
     depends_on:
       - ngen