From cb4863cc8cdcc5d7d684df71ebadba91b12f0e9d Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Mon, 23 Oct 2023 15:55:56 +0000 Subject: [PATCH 1/8] do not send builds when current build is not on server --- src/Helpers/Builds.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php index 7749c45..0dd32d2 100644 --- a/src/Helpers/Builds.php +++ b/src/Helpers/Builds.php @@ -64,6 +64,11 @@ { $ret = array(); + if(is_null($this->currentBuild)){ + $this->logger->info("Unable to find current build on server, returning empty array"); + return $ret; + } + foreach ($this->builds as $build) { if (!$build->checkVersion($this->currentBuild)) { -- GitLab From 153b012762e7d3afdb35059a6a6f8e3054cf8593 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:37:14 +0000 Subject: [PATCH 2/8] trying aligning with build docker --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3051ed6..a7d3f92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,10 @@ image: docker:19.03.1 # When using dind, it's wise to use the overlayfs driver for # improved performance. variables: - DOCKER_DRIVER: overlay2 + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" PUBLISH_USER: root PUBLISH_URL: ota.ecloud.global - DOCKER_TLS_CERTDIR: "/certs" build: stage: build -- GitLab From 44425ffa2bbf75fe9573445fa561d8ecc83c4607 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:38:50 +0000 Subject: [PATCH 3/8] test --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7d3f92..b4b8401 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ build: services: - docker:19.03.1-dind script: + - echo "registry: "$CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . -- GitLab From b57b5ae02719ef9c03e1426cd9e181e5002c84c7 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:39:20 +0000 Subject: [PATCH 4/8] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4b8401..e081770 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: services: - docker:19.03.1-dind script: - - echo "registry: "$CI_REGISTRY + - echo "registry: " $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . -- GitLab From 48c956d66705e098ac461fffa67188c8486b0caa Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:39:45 +0000 Subject: [PATCH 5/8] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e081770..32c09e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: services: - docker:19.03.1-dind script: - - echo "registry: " $CI_REGISTRY + - echo $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . -- GitLab From a490e1ee8ca034b2718182ae426a0f2b7e3fe0b2 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:40:39 +0000 Subject: [PATCH 6/8] Revert "trying aligning with build docker" This reverts commit 153b012762e7d3afdb35059a6a6f8e3054cf8593 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32c09e7..a53c087 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,10 @@ image: docker:19.03.1 # When using dind, it's wise to use the overlayfs driver for # improved performance. variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" + DOCKER_DRIVER: overlay2 PUBLISH_USER: root PUBLISH_URL: ota.ecloud.global + DOCKER_TLS_CERTDIR: "/certs" build: stage: build -- GitLab From b79911c766fee4b8c782083538f4645914bfbef6 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 10:42:33 +0000 Subject: [PATCH 7/8] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a53c087..80ca253 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ build: script: - echo $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi -- GitLab From 49239e35bcdb86b85113982cd217156f7162a56e Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Oct 2023 13:46:14 +0000 Subject: [PATCH 8/8] removing test --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80ca253..90cfb07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ build: services: - docker:19.03.1-dind script: - - echo $CI_REGISTRY - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . -- GitLab