From 80f1c5441c35f19a374aca55f12fa1ee44758758 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 22:49:03 +0000 Subject: [PATCH 1/2] Delete gitlab-ci.yml --- gitlab-ci.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 gitlab-ci.yml diff --git a/gitlab-ci.yml b/gitlab-ci.yml deleted file mode 100644 index fb13cb0..0000000 --- a/gitlab-ci.yml +++ /dev/null @@ -1,26 +0,0 @@ - -docker-build: - image: docker:latest - stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - # Default branch leaves tag empty (= latest tag) - # All other branches are tagged with the escaped branch name (commit ref slug) - script: - - | - if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - tag="" - echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'" - else - tag=":$CI_COMMIT_REF_SLUG" - echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag" - fi - - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" . - - docker push "$CI_REGISTRY_IMAGE${tag}" - # Run this job in a branch where a Dockerfile exists - rules: - - if: $CI_COMMIT_BRANCH - exists: - - Dockerfile From c875b9b23cea7ee318e57aa0d69eead653c58540 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 22:49:52 +0000 Subject: [PATCH 2/2] Update .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 757219e..23f365c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ build-docker: - image: docker:latest + image: docker:cli before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: