diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf0b6af8124ea37d4e87f45a9bbca18909f5a0ff..9299fcf9b8d39d8d771c2d8acbe6bf4ca468c026 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,22 +50,22 @@ branchJobWindowsRestful: except: - master -#branchJobLinux: -# tags: -# - docker -# stage: linux -# before_script: -# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY -# script: -# - cd docker -# - ./build.sh -# - ./run_test.sh -# - docker tag rpc-server:latest $CI_REGISTRY_IMAGE:rpc -# - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful -# - docker push $CI_REGISTRY_IMAGE:rpc -# - docker push $CI_REGISTRY_IMAGE:restful -# except: -# - master +branchJobLinux: + tags: + - docker + stage: linux + before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - cd docker + - ./build.sh + - ./run_test.sh + - docker tag rpc-server:latest $CI_REGISTRY_IMAGE:rpc + - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful + - docker push $CI_REGISTRY_IMAGE:rpc + - docker push $CI_REGISTRY_IMAGE:restful + except: + - master # build, test and publish docker images #masterJobLinux: