diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9db6f4f5950b8e66b69ec549d3730882b03104d3..6242e9a83014c39665b7bb7340d980600ebb7368 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,20 +19,20 @@ docker:front: - docker build --target production -t $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat:$CI_COMMIT_REF_SLUG ./client - docker push $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat:$CI_COMMIT_REF_SLUG only: - - master + - main docker:back: -image: docker -services: - - name: docker:dind - alias: dockerhost -stage: build -before_script: -- i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done -- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY -script: -- docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat-server:$CI_COMMIT_REF_SLUG ./server -- docker push $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat-server:$CI_COMMIT_REF_SLUG -only: -- master + image: docker + services: + - name: docker:dind + alias: dockerhost + stage: build + before_script: + - i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat-server:$CI_COMMIT_REF_SLUG ./server + - docker push $CI_REGISTRY/$CI_PROJECT_PATH/rustaheat-server:$CI_COMMIT_REF_SLUG + only: + - main