diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f86f0ac5a71a8415e93ce2698c9283111797530a..50f0f830d3e89142c1895c32e86e579ebf643553 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,14 +52,14 @@ build_client: - echo $CI_REGISTRY_USER - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY variables: - CLIENT_IMAGE_TAG: $CI_REGISTRY/client:$CI_COMMIT_TAG - CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/client:latest + CLIENT_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:$CI_COMMIT_TAG + CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:latest script: - cd app/client - docker build -t $CLIENT_IMAGE_TAG . - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG - - docker image push $CLIENT_IMAGE_TAG - - docker image push $CLIENT_RELEASE_IMAGE_TAG + - docker push $CLIENT_IMAGE_TAG + - docker push $CLIENT_RELEASE_IMAGE_TAG build_server: stage: build @@ -76,8 +76,8 @@ build_server: - echo $CI_REGISTRY_USER - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY variables: - SERVER_IMAGE_TAG: $CI_REGISTRY/server:$CI_COMMIT_TAG - SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/server:latest + SERVER_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:$CI_COMMIT_TAG + SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:latest script: - cd app/server - docker build -t $SERVER_IMAGE_TAG .