diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8e00254341babc59c5678063b7c11c27fcceee3..61e263a0197bba5b2dbf9d8a14c6b19869f3d54f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,12 +45,13 @@ build windows-1809: - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows-1809/cuda-devel/ddraw.dll' - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows-1809/cuda-devel/nvcuda.dll' script: - - docker build --isolation process --memory 2G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows-1809" windows-1809/base - - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows-1809" - - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows-1809" -f windows-1809/devel/Dockerfile windows-1809/devel - - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows-1809" - - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows-1809" -f windows-1809/cuda-devel/Dockerfile windows-1809/cuda-devel - - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows-1809" + - $image_name = "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower())" + - docker build --memory 10G -t "${image_name}:base-windows-1809" windows-1809/base + - docker push "${image_name}:base-windows-1809" + - docker build --memory 15G -t "${image_name}:devel-windows-1809" -f windows-1809/devel/Dockerfile windows-1809/devel + - docker push "${image_name}:devel-windows-1809" + - docker build --memory 15G -t "${image_name}:cuda-devel-windows-1809" -f windows-1809/cuda-devel/Dockerfile windows-1809/cuda-devel + - docker push "${image_name}:cuda-devel-windows-1809" after_script: - docker logout "${CI_REGISTRY}"