Commit 09878329 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '5-fix-image-build' into 's_of_q_omega_demo' 

Build without adios, gpu

Closes #5

See merge request ndip/tool-sources/dca/dca-main!5
parents 988da399 a9fb9c7b

.gitlab-ci.yml

+2 −22
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ after_script: 
build-dca-cpu:

  stage: build

  variables:

    TAG: "0.1"

    TAG: "0.2"

    FORCE_TAGS: "false"

  when: manual

  script:

    - docker build -f dockerfiles/Dockerfile.cpu -t image .

    - docker build -f dockerfiles/Dockerfile_no_adios.cpu -t image .

    - docker tag image ${IMAGE_NAME}:build-$CI_COMMIT_SHORT_SHA

    - docker push ${IMAGE_NAME}:build-$CI_COMMIT_SHORT_SHA

    - >
@@ -36,23 +36,3 @@ build-dca-cpu: 
      fi

  tags:

    - rse-multi-builder
 




build-dca-gpu:

  stage: build

  variables:

    TAG: "0.1"

    FORCE_TAGS: "false"

  when: manual

  script:

    - docker build -f dockerfiles/Dockerfile.gpu -t image .

    - docker tag image ${IMAGE_NAME_GPU}:build-$CI_COMMIT_SHORT_SHA

    - docker push ${IMAGE_NAME_GPU}:build-$CI_COMMIT_SHORT_SHA

    - >

      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ] || [ "$FORCE_TAGS" == "true" ]; then

        docker tag image ${IMAGE_NAME_GPU}:latest

        docker push ${IMAGE_NAME_GPU}:latest

        docker pull ${IMAGE_NAME_GPU}:${TAG} || docker tag image ${IMAGE_NAME_GPU}:${TAG} &&  docker push ${IMAGE_NAME_GPU}:${TAG}

      fi

  tags:

    - rse-multi-builder