Changes for building images from internal build docker runner

conan-el6-gcc44/.gitlab-ci.yml

@@ -19,26 +19,26 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
 
 build:
     stage: build
     script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
+        - docker build ${DOCKER_BUILD_EXTRA_OPTIONS} --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
         - docker push ${CONTAINER_TEST_IMAGE}
 
 test:
     stage: test
     script:
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version
 
 release:
     stage: release