From cd2a1a119a2411a21bfd8ef0e7869f9679a3cf84 Mon Sep 17 00:00:00 2001 From: Schtil Date: Thu, 20 Feb 2025 20:47:18 +0000 Subject: [PATCH 1/3] Fulfilling the requirements of the petition - update docker compose --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b65387a..fc139dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,14 +8,13 @@ variables: DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client" DOCKER_DRIVER: overlay2 -image: docker:20.10.16 +image: docker:27.5.1 services: - - name: docker:20.10.16-dind + - name: docker:27.5.1-dind command: [ "--registry-mirror=http://gitlab.prodcontest.ru:5015", - "--registry-mirror=https://dockerhub.timeweb.cloud", - "--registry-mirror=https://huecker.io", + "--registry-mirror=https://dockerhub.timeweb.cloud" ] test: @@ -27,11 +26,14 @@ test: before_script: - for try in {1..10}; do sleep 0.5; docker info && break ; done - echo "$DOCKER_DEPLOY_KEY" | docker login -u "backend" --password-stdin $CI_REGISTRY - - cd solution && docker-compose up -d + - docker compose version + - cd solution && docker compose up -d + - echo "Sleep 60 second" + - sleep 60 script: - docker run -v $CI_PROJECT_DIR:/app/result --network host gitlab.prodcontest.ru:5050/2025-final-indiv-repos/backend-checker:v1.0 after_script: - - docker-compose down + - cd solution && docker compose down artifacts: paths: - total_stats.json From c3a96591013c43f0fbfe4dcf55ac40a331217963 Mon Sep 17 00:00:00 2001 From: Schtil Date: Thu, 20 Feb 2025 21:51:01 +0000 Subject: [PATCH 2/3] update backend-checker --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc139dd..0d2b283 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,8 @@ test: - echo "$DOCKER_DEPLOY_KEY" | docker login -u "backend" --password-stdin $CI_REGISTRY - docker compose version - cd solution && docker compose up -d - - echo "Sleep 60 second" - - sleep 60 script: - - docker run -v $CI_PROJECT_DIR:/app/result --network host gitlab.prodcontest.ru:5050/2025-final-indiv-repos/backend-checker:v1.0 + - docker run -v $CI_PROJECT_DIR:/app/result --network host gitlab.prodcontest.ru:5050/2025-final-indiv-repos/backend-checker:v1.1 after_script: - cd solution && docker compose down artifacts: From d39be071f71b3574f4d2367bdcd817e285975c7d Mon Sep 17 00:00:00 2001 From: Schtil Date: Thu, 20 Feb 2025 22:27:00 +0000 Subject: [PATCH 3/3] yet-another backend-checker update --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d2b283..7affe27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ test: - docker compose version - cd solution && docker compose up -d script: - - docker run -v $CI_PROJECT_DIR:/app/result --network host gitlab.prodcontest.ru:5050/2025-final-indiv-repos/backend-checker:v1.1 + - docker run -v $CI_PROJECT_DIR:/app/result --network host gitlab.prodcontest.ru:5050/2025-final-indiv-repos/backend-checker:v1.2 after_script: - cd solution && docker compose down artifacts: