From db38b68080c8b0c41cb126551d9d2358e1baaeaa Mon Sep 17 00:00:00 2001 From: Sreeram R Date: Thu, 14 Sep 2023 11:39:46 +0000 Subject: [PATCH 1/2] Update pipeline to user default port for gitlab registry --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3261aee..0dcf3f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - build variables: - CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH + CONTAINER_IMAGE: registry.gitlab.e.foundation/$CI_PROJECT_PATH GIT_SUBMODULE_STRATEGY: recursive build-docker: @@ -16,7 +16,7 @@ build-docker: services: - docker:19-dind script: - - echo "$CI_JOB_TOKEN" | docker login registry.gitlab.e.foundation:5000 -u gitlab-ci-token --password-stdin + - echo "$CI_JOB_TOKEN" | docker login registry.gitlab.e.foundation -u gitlab-ci-token --password-stdin - docker pull $CONTAINER_IMAGE:latest || true - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR} - docker push $CONTAINER_IMAGE:latest -- GitLab From bb692690278818953206d9a44a258c496f4e2341 Mon Sep 17 00:00:00 2001 From: Sreeram R Date: Thu, 14 Sep 2023 11:49:55 +0000 Subject: [PATCH 2/2] Update docker login --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dcf3f0..c82dffa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ build-docker: services: - docker:19-dind script: - - echo "$CI_JOB_TOKEN" | docker login registry.gitlab.e.foundation -u gitlab-ci-token --password-stdin + - docker login registry.gitlab.e.foundation -u gitlab-ci-token -p ${CI_JOB_TOKEN} - docker pull $CONTAINER_IMAGE:latest || true - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR} - docker push $CONTAINER_IMAGE:latest -- GitLab