[buoh/ci-bump: 4/4] ci: Stop building custom Docker image
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [buoh/ci-bump: 4/4] ci: Stop building custom Docker image
- Date: Tue, 14 Jul 2020 00:11:57 +0000 (UTC)
commit 979dab91dd5f1dec4885052cd258de5574515954
Author: Jan Tojnar <jtojnar gmail com>
Date: Tue Jul 14 02:10:52 2020 +0200
ci: Stop building custom Docker image
It is not worth the effort.
ci/Dockerfile | 5 -----
ci/build-image.sh | 21 ---------------------
ci/gitlab-ci.yaml | 43 +------------------------------------------
3 files changed, 1 insertion(+), 68 deletions(-)
---
diff --git a/ci/gitlab-ci.yaml b/ci/gitlab-ci.yaml
index eccefd5..93f4e79 100644
--- a/ci/gitlab-ci.yaml
+++ b/ci/gitlab-ci.yaml
@@ -1,45 +1,4 @@
-image: docker:stable
-
-services:
- - docker:dind
-
-variables:
- DOCKER_HOST: tcp://docker:2375
- DOCKER_DRIVER: overlay2
-
-# We compare the hash of default.nix file with a label of the Docker image
-# stored in the container registry; when they do not match, we will try
-# to build an image based on nixos/nix containing all the build dependencies,
-# then upload the built image to the registry. Finally the image will be used
-# to build the package using Nix, and to run checks.
-
-build_image:
- stage: build
- script: ci/build-image.sh "$CI_JOB_TOKEN" "$CI_REGISTRY_IMAGE:latest"
- except:
- - /^ci-.*/
-
build:
stage: test
- image: $CI_REGISTRY_IMAGE:latest
+ image: nixos/nix:latest
script: nix-build
- except:
- - /^ci-.*/
-
-# We use a different image tag for branches starting with “ci-” prefix so that
-# we could develop the CI set-up without interfering with the deployed one.
-# Since the CI tweaks are going to be quite rare, we are sharing a single
-# tag among all of them, in order not to clog the registry.
-
-build_image_dev:
- stage: build
- script: ci/build-image.sh "$CI_JOB_TOKEN" "$CI_REGISTRY_IMAGE:development"
- only:
- - /^ci-.*/
-
-build_dev:
- stage: test
- image: $CI_REGISTRY_IMAGE:development
- script: nix-build
- only:
- - /^ci-.*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]